Corrected code style and titles

This commit is contained in:
Jose Ivan Vargas 2017-01-16 10:11:25 -05:00
parent bc7c6c6892
commit 373411d18d
5 changed files with 5 additions and 6 deletions

View File

@ -4,8 +4,8 @@ module Projects
include ServiceParams
before_action :authorize_admin_project!
layout "project_settings"
def show
@hooks = @project.hooks
@hook = ProjectHook.new

View File

@ -211,6 +211,7 @@ module GitlabRoutingHelper
def project_settings_integrations_path(project, *args)
namespace_project_settings_integrations_path(project.namespace, project, *args)
end
def project_settings_members_path(project, *args)
namespace_project_settings_members_path(project.namespace, project, *args)
end

View File

@ -9,7 +9,7 @@
%span
Deploy Keys
= nav_link(controller: :integrations) do
= link_to namespace_project_settings_integrations_path(@project.namespace, @project), title: 'Webhooks' do
= link_to namespace_project_settings_integrations_path(@project.namespace, @project), title: 'Integrations' do
%span
Integrations
= nav_link(controller: :protected_branches) do

View File

@ -1,5 +1,3 @@
- context_title = @project ? 'project' : 'group'
.row.prepend-top-default
.col-lg-3
%h4.prepend-top-0

View File

@ -1,8 +1,8 @@
require('spec_helper')
require 'spec_helper'
describe Projects::Settings::IntegrationsController do
let(:project) { create(:project, :public) }
let(:user) { create(:user) }
let(:user) { create(:user) }
before do
project.team << [user, :master]