Add latest changes from gitlab-org/gitlab@master

4 files changed, 14 insertions, 2 deletions

diff --git a/app/assets/javascripts/releases/mount_edit.js b/app/assets/javascripts/releases/mount_edit.js
index 343de8c56d3..2bc2728312a 100644
--- a/app/assets/javascripts/releases/mount_edit.js
+++ b/app/assets/javascripts/releases/mount_edit.js
@@ -7,7 +7,7 @@ export default () => {
   const el = document.getElementById('js-edit-release-page');
 
   const store = createStore({ detail: detailModule });
-  store.dispatch('setInitialState', el.dataset);
+  store.dispatch('detail/setInitialState', el.dataset);
 
   return new Vue({
     el,
diff --git a/app/graphql/types/group_type.rb b/app/graphql/types/group_type.rb
index 718770ebfbc..9f3905000b2 100644
--- a/app/graphql/types/group_type.rb
+++ b/app/graphql/types/group_type.rb
@@ -46,6 +46,12 @@ module Types
     field :milestones, Types::MilestoneType.connection_type, null: true,
           description: 'Find milestones',
           resolver: Resolvers::MilestoneResolver
+
+    field :boards,
+          Types::BoardType.connection_type,
+          null: true,
+          description: 'Boards of the group',
+          resolver: Resolvers::BoardsResolver
   end
 end
 
diff --git a/app/graphql/types/project_type.rb b/app/graphql/types/project_type.rb
index b44baa50955..f89bd5575a3 100644
--- a/app/graphql/types/project_type.rb
+++ b/app/graphql/types/project_type.rb
@@ -179,6 +179,12 @@ module Types
           null: true,
           description: 'Paginated collection of Sentry errors on the project',
           resolver: Resolvers::ErrorTracking::SentryErrorCollectionResolver
+
+    field :boards,
+          Types::BoardType.connection_type,
+          null: true,
+          description: 'Boards of the project',
+          resolver: Resolvers::BoardsResolver
   end
 end
 
diff --git a/app/services/incident_management/create_issue_service.rb b/app/services/incident_management/create_issue_service.rb
index 94b6f037924..43077e03e6d 100644
--- a/app/services/incident_management/create_issue_service.rb
+++ b/app/services/incident_management/create_issue_service.rb
@@ -58,7 +58,7 @@ module IncidentManagement
     end
 
     def issue_description
-      horizontal_line = "\n---\n\n"
+      horizontal_line = "\n\n---\n\n"
 
       [
         alert_summary,