Automatic merge of gitlab-org/gitlab-ce master

.gitlab/ci/frontend.gitlab-ci.yml

@@ -38,6 +38,7 @@ gitlab:assets:compile:
     - bundle exec rake gitlab:assets:compile
     - time scripts/build_assets_image
     - scripts/clean-old-cached-assets
+    - rm -f /etc/apt/sources.list.d/google*.list # We don't need to update Chrome here
     # Play dependent manual jobs
     - install_api_client_dependencies_with_apt
     - play_job "review-build-cng" || true # this job might not exist so ignore the failure if it cannot be played

app/assets/javascripts/boards/components/sidebar/remove_issue.vue

@@ -48,7 +48,7 @@ export default Vue.extend({
         list.removeIssue(issue);
       });
 
-      boardsStore.detail.issue = {};
+      boardsStore.clearDetailIssue();
     },
     /**
      * Build the default patch request.

app/assets/javascripts/boards/index.js

@@ -180,7 +180,7 @@ export default () => {
         boardsStore.detail.issue = newIssue;
       },
       clearDetailIssue() {
-        boardsStore.detail.issue = {};
+        boardsStore.clearDetailIssue();
       },
       toggleSubscription(id) {
         const { issue } = boardsStore.detail;

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

@@ -188,6 +188,10 @@ const boardsStore = {
   updateFiltersUrl() {
     window.history.pushState(null, null, `?${this.filter.path}`);
   },
+
+  clearDetailIssue() {
+    this.detail.issue = {};
+  },
 };
 
 BoardsStoreEE.initEESpecific(boardsStore);

spec/javascripts/boards/boards_store_spec.js

@@ -268,4 +268,14 @@ describe('Store', () => {
       });
     });
   });
+
+  describe('clearDetailIssue', () => {
+    it('resets issue details', () => {
+      boardsStore.detail.issue = 'something';
+
+      boardsStore.clearDetailIssue();
+
+      expect(boardsStore.detail.issue).toEqual({});
+    });
+  });
 });