Merge branch 'psimyn-scoped-milestone-encoding' into 'master'

Fix Scoped Boards bug filtering by No Milestone

Closes gitlab-ce#43317

See merge request gitlab-org/gitlab-ee!4966

ee/app/assets/javascripts/boards/stores/boards_store_ee.js

@@ -19,7 +19,7 @@ class BoardsStoreEE {
       if (this.$boardApp) {
         this.store.boardConfig = {
           milestoneId: parseInt(this.$boardApp.dataset.boardMilestoneId, 10),
-          milestoneTitle: this.$boardApp.dataset.boardMilestoneTitle,
+          milestoneTitle: this.$boardApp.dataset.boardMilestoneTitle || '',
           assigneeUsername: this.$boardApp.dataset.boardAssigneeUsername,
           labels: JSON.parse(this.$boardApp.dataset.labels || []),
           weight: parseInt(this.$boardApp.dataset.boardWeight, 10),
@@ -42,9 +42,11 @@ class BoardsStoreEE {
     let milestoneTitle = this.store.boardConfig.milestoneTitle;
     if (this.store.boardConfig.milestoneId === 0) {
       milestoneTitle = 'No+Milestone';
+    } else {
+      milestoneTitle = encodeURIComponent(milestoneTitle);
     }
     if (milestoneTitle) {
-      updateFilterPath('milestone_title', encodeURIComponent(milestoneTitle));
+      updateFilterPath('milestone_title', milestoneTitle);
       this.store.cantEdit.push('milestone');
     }
 

ee/changelogs/unreleased/psimyn-scoped-milestone-encoding.yml

+---
+title: Fix Scoped Boards bug filtering by No Milestone
+merge_request:
+author:
+type: fixed

ee/spec/features/boards/scoped_issue_board_spec.rb

@@ -46,7 +46,14 @@ describe 'Scoped issue boards', :js do
           expect(page).to have_selector('.card', count: 1)
         end
 
-        it 'creates board to filtering by Any Milestone' do
+        it 'creates board filtering by No Milestone' do
+          create_board_milestone('No Milestone')
+
+          expect(find('.tokens-container')).to have_content("")
+          expect(page).to have_selector('.card', count: 2)
+        end
+
+        it 'creates board filtering by Any Milestone' do
           create_board_milestone('Any Milestone')
 
           expect(find('.tokens-container')).to have_content("")