Add latest changes from gitlab-org/gitlab@13-4-stable-ee

2 files changed, 9 insertions, 4 deletions

diff --git a/app/controllers/groups/boards_controller.rb b/app/controllers/groups/boards_controller.rb
index 23d4f0d24e9..ea7e83a2caf 100644
--- a/app/controllers/groups/boards_controller.rb
+++ b/app/controllers/groups/boards_controller.rb
@@ -8,6 +8,7 @@ class Groups::BoardsController < Groups::ApplicationController
   before_action :assign_endpoint_vars
   before_action do
     push_frontend_feature_flag(:multi_select_board, default_enabled: true)
+    push_frontend_feature_flag(:graphql_board_lists, group, default_enabled: false)
     push_frontend_feature_flag(:boards_with_swimlanes, group, default_enabled: false)
   end
 
diff --git a/app/controllers/groups/settings/integrations_controller.rb b/app/controllers/groups/settings/integrations_controller.rb
index adfbe9bfa17..e8551a7f270 100644
--- a/app/controllers/groups/settings/integrations_controller.rb
+++ b/app/controllers/groups/settings/integrations_controller.rb
@@ -8,15 +8,19 @@ module Groups
       before_action :authorize_admin_group!
 
       def index
-        @integrations = []
+        @integrations = Service.find_or_initialize_all(Service.for_group(group)).sort_by(&:title)
+      end
+
+      def edit
+        @default_integration = Service.default_integration(integration.type, group)
+
+        super
       end
 
       private
 
-      # TODO: Make this compatible with group-level integration
-      # https://gitlab.com/groups/gitlab-org/-/epics/2543
       def find_or_initialize_integration(name)
-        Project.first.find_or_initialize_service(name)
+        Service.find_or_initialize_integration(name, group_id: group.id)
       end
 
       def integrations_enabled?