-
- Downloads
Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master'
Moved the webhooks and services gear options to a single one called integrations See merge request !8380
No related branches found
No related tags found
Showing
- app/controllers/projects/hooks_controller.rb 4 additions, 10 deletionsapp/controllers/projects/hooks_controller.rb
- app/controllers/projects/services_controller.rb 0 additions, 4 deletionsapp/controllers/projects/services_controller.rb
- app/controllers/projects/settings/integrations_controller.rb 18 additions, 0 deletionsapp/controllers/projects/settings/integrations_controller.rb
- app/helpers/gitlab_routing_helper.rb 4 additions, 0 deletionsapp/helpers/gitlab_routing_helper.rb
- app/views/layouts/nav/_project_settings.html.haml 3 additions, 7 deletionsapp/views/layouts/nav/_project_settings.html.haml
- app/views/projects/hooks/_index.html.haml 0 additions, 0 deletionsapp/views/projects/hooks/_index.html.haml
- app/views/projects/services/_index.html.haml 0 additions, 2 deletionsapp/views/projects/services/_index.html.haml
- app/views/projects/settings/integrations/_project_hook.html.haml 0 additions, 0 deletions...ws/projects/settings/integrations/_project_hook.html.haml
- app/views/projects/settings/integrations/show.html.haml 3 additions, 0 deletionsapp/views/projects/settings/integrations/show.html.haml
- app/views/shared/web_hooks/_form.html.haml 0 additions, 3 deletionsapp/views/shared/web_hooks/_form.html.haml
- config/routes/project.rb 1 addition, 1 deletionconfig/routes/project.rb
- features/project/active_tab.feature 3 additions, 3 deletionsfeatures/project/active_tab.feature
- features/steps/project/active_tab.rb 4 additions, 4 deletionsfeatures/steps/project/active_tab.rb
- features/steps/project/hooks.rb 3 additions, 3 deletionsfeatures/steps/project/hooks.rb
- features/steps/project/services.rb 1 addition, 1 deletionfeatures/steps/project/services.rb
- features/steps/shared/paths.rb 1 addition, 1 deletionfeatures/steps/shared/paths.rb
- spec/controllers/projects/settings/integrations_controller_spec.rb 20 additions, 0 deletions...rollers/projects/settings/integrations_controller_spec.rb
- spec/features/security/project/internal_access_spec.rb 2 additions, 2 deletionsspec/features/security/project/internal_access_spec.rb
- spec/features/security/project/private_access_spec.rb 2 additions, 2 deletionsspec/features/security/project/private_access_spec.rb
- spec/features/security/project/public_access_spec.rb 2 additions, 2 deletionsspec/features/security/project/public_access_spec.rb
Loading
Please register or sign in to comment