Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/boards/components/board_card.vue

@@ -66,7 +66,7 @@ export default {
           eventHub.$emit('clearDetailIssue');
         } else {
           eventHub.$emit('newDetailIssue', this.issue);
-          boardsStore.detail.list = this.list;
+          boardsStore.setListDetail(this.list);
         }
       }
     },

app/assets/javascripts/boards/components/board_new_issue.vue

@@ -73,7 +73,7 @@ export default {
           $(this.$refs.submitButton).enable();
 
           boardsStore.setIssueDetail(issue);
-          boardsStore.detail.list = this.list;
+          boardsStore.setListDetail(this.list);
         })
         .catch(() => {
           // Need this because our jQuery very kindly disables buttons on ALL form submissions

app/assets/javascripts/boards/stores/boards_store.js

@@ -207,6 +207,10 @@ const boardsStore = {
     eventHub.$emit('updateTokens');
   },
 
+  setListDetail(newList) {
+    this.detail.list = newList;
+  },
+
   updateFiltersUrl() {
     window.history.pushState(null, null, `?${this.filter.path}`);
   },

doc/user/group/clusters/index.md

+---
+type: reference
+---
+
 # Group-level Kubernetes clusters
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/34758) in GitLab 11.6.

doc/user/project/merge_requests/code_quality.md

@@ -19,7 +19,7 @@ in the merge request widget area:
 
 For instance, consider the following workflow:
 
-1. Your backend team member starts a new implementation for making certain feature in your app faster
+1. Your backend team member starts a new implementation for making a certain feature in your app faster
 1. With Code Quality reports, they analyze how their implementation is impacting the code quality
 1. The metrics show that their code degrade the quality in 10 points
 1. You ask a co-worker to help them with this modification
@@ -63,7 +63,7 @@ Example:
 NOTE: **Note:**
 Although the Code Climate spec supports more properties, those are ignored by GitLab.
 
-For more information on how the Code Quality job should look like, check the
+For more information on what the Code Quality job should look like, check the
 example on [analyzing a project's code quality](../../../ci/examples/code_quality.md).
 
 GitLab then checks this report, compares the metrics between the source and target

spec/javascripts/boards/boards_store_spec.js

@@ -312,6 +312,17 @@ describe('Store', () => {
     });
   });
 
+  describe('setListDetail', () => {
+    it('sets the list detail', () => {
+      boardsStore.detail.list = 'not a list';
+
+      const dummyValue = 'new list';
+      boardsStore.setListDetail(dummyValue);
+
+      expect(boardsStore.detail.list).toEqual(dummyValue);
+    });
+  });
+
   describe('clearDetailIssue', () => {
     it('resets issue details', () => {
       boardsStore.detail.issue = 'something';