diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 18:09:16 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 18:09:16 +0000 |
commit | 80e9fdc9682cfbcfb9202a2733605a6a6bd23f05 (patch) | |
tree | 168375ea13d1a1f01d4cbcf6f0513fc9883e9477 /app/helpers | |
parent | 5372e109c0660e4670aa987568a51082beca1b3c (diff) | |
download | gitlab-ce-80e9fdc9682cfbcfb9202a2733605a6a6bd23f05.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/groups_helper.rb | 13 | ||||
-rw-r--r-- | app/helpers/services_helper.rb | 14 |
2 files changed, 22 insertions, 5 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 5abe6a635e0..0d7e2a7bd38 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -11,7 +11,18 @@ module GroupsHelper end def group_nav_link_paths - %w[groups#projects groups#edit badges#index ci_cd#show ldap_group_links#index hooks#index audit_events#index pipeline_quota#index] + %w[ + groups#projects + groups#edit + badges#index + ci_cd#show + integrations#index + integrations#edit + ldap_group_links#index + hooks#index + audit_events#index + pipeline_quota#index + ] end def group_packages_nav_link_paths diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb index fe2df918819..a4b6e613100 100644 --- a/app/helpers/services_helper.rb +++ b/app/helpers/services_helper.rb @@ -62,10 +62,6 @@ module ServicesHelper !current_controller?("admin/services") && service.deprecated? end - def edit_integration_path(integration) - edit_admin_application_settings_integration_path(integration) - end - def scoped_integrations_path if @project.present? project_settings_integrations_path(@project) @@ -86,6 +82,16 @@ module ServicesHelper end end + def scoped_edit_integration_path(integration) + if @project.present? + edit_project_settings_integration_path(@project, integration) + elsif @group.present? + edit_group_settings_integration_path(@group, integration) + else + edit_admin_application_settings_integration_path(integration) + end + end + def scoped_test_integration_path(integration) if @project.present? test_project_settings_integration_path(@project, integration) |