diff options
author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-01-16 18:11:25 +0300 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-01-19 00:19:35 +0300 |
commit | 373411d18d019f5321475e4b770cb36f4461a462 (patch) | |
tree | 0b515550d211302ae91a42409405297b92b0f366 | |
parent | bc7c6c689239a5db3f0c4edcbb77d6b9e586ba22 (diff) |
Corrected code style and titles
5 files changed, 5 insertions, 6 deletions
diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb index 07563e45865..fb2a4837735 100644 --- a/app/controllers/projects/settings/integrations_controller.rb +++ b/app/controllers/projects/settings/integrations_controller.rb @@ -4,8 +4,8 @@ module Projects include ServiceParams before_action :authorize_admin_project! - layout "project_settings" + def show @hooks = @project.hooks @hook = ProjectHook.new diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb index 44e22d6abd5..2159e4ce21a 100644 --- a/app/helpers/gitlab_routing_helper.rb +++ b/app/helpers/gitlab_routing_helper.rb @@ -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 diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml index 08e016a1773..c6df66d2c3c 100644 --- a/app/views/layouts/nav/_project_settings.html.haml +++ b/app/views/layouts/nav/_project_settings.html.haml @@ -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 diff --git a/app/views/shared/web_hooks/_form.html.haml b/app/views/shared/web_hooks/_form.html.haml index 070c70d28ea..edbaa885780 100644 --- a/app/views/shared/web_hooks/_form.html.haml +++ b/app/views/shared/web_hooks/_form.html.haml @@ -1,5 +1,3 @@ -- context_title = @project ? 'project' : 'group' - .row.prepend-top-default .col-lg-3 %h4.prepend-top-0 diff --git a/spec/controllers/projects/settings/integrations_controller_spec.rb b/spec/controllers/projects/settings/integrations_controller_spec.rb index f6f0653dbc9..e0f9a5b24a6 100644 --- a/spec/controllers/projects/settings/integrations_controller_spec.rb +++ b/spec/controllers/projects/settings/integrations_controller_spec.rb @@ -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] |