Corrected code style and titles
This commit is contained in:
parent
bc7c6c6892
commit
373411d18d
|
@ -4,8 +4,8 @@ module Projects
|
|||
include ServiceParams
|
||||
|
||||
before_action :authorize_admin_project!
|
||||
|
||||
layout "project_settings"
|
||||
|
||||
def show
|
||||
@hooks = @project.hooks
|
||||
@hook = ProjectHook.new
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
- context_title = @project ? 'project' : 'group'
|
||||
|
||||
.row.prepend-top-default
|
||||
.col-lg-3
|
||||
%h4.prepend-top-0
|
||||
|
|
|
@ -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]
|
||||
|
|
Loading…
Reference in New Issue