Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 0 deletions

diff --git a/app/controllers/groups/settings/integrations_controller.rb b/app/controllers/groups/settings/integrations_controller.rb
new file mode 100644
index 00000000000..43f8a7118d4
--- /dev/null
+++ b/app/controllers/groups/settings/integrations_controller.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Groups
+  module Settings
+    class IntegrationsController < Groups::ApplicationController
+      include IntegrationsActions
+
+      before_action :authorize_admin_group!
+
+      private
+
+      def integrations_enabled?
+        Feature.enabled?(:group_level_integrations, group)
+      end
+
+      def scoped_edit_integration_path(integration)
+        edit_group_settings_integration_path(group, integration)
+      end
+    end
+  end
+end