Add latest changes from gitlab-org/gitlab@master

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)