Merge branch 'ce-to-ee-2018-01-18' into 'master'

CE upstream - Thursday

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

app/assets/javascripts/boards/utils/query_data.js

@@ -5,7 +5,7 @@ export default (path, extraData) => path.split('&').reduce((dataParam, filterPar
   const paramSplit = filterParam.split('=');
   const paramKeyNormalized = paramSplit[0].replace('[]', '');
   const isArray = paramSplit[0].indexOf('[]');
-  const value = decodeURIComponent(paramSplit[1]).replace(/\+/g, ' ');
+  const value = decodeURIComponent(paramSplit[1].replace(/\+/g, ' '));
 
   if (isArray !== -1) {
     if (!data[paramKeyNormalized]) {

changelogs/unreleased/34252-trailing-plus.yml

+---
+title: Allow trailing + on labels in board filters
+merge_request: 16490
+author:
+type: fixed

spec/features/boards/boards_spec.rb

@@ -71,6 +71,7 @@ describe 'Issue Boards', :js do
     let!(:backlog)    { create(:label, project: project, name: 'Backlog') }
     let!(:closed)       { create(:label, project: project, name: 'Closed') }
     let!(:accepting)  { create(:label, project: project, name: 'Accepting Merge Requests') }
+    let!(:a_plus) { create(:label, project: project, name: 'A+') }
 
     let!(:list1) { create(:list, board: board, label: planning, position: 0) }
     let!(:list2) { create(:list, board: board, label: development, position: 1) }
@@ -85,6 +86,7 @@ describe 'Issue Boards', :js do
     let!(:issue7) { create(:labeled_issue, project: project, title: 'ggg', description: '777', labels: [development], relative_position: 2) }
     let!(:issue8) { create(:closed_issue, project: project, title: 'hhh', description: '888') }
     let!(:issue9) { create(:labeled_issue, project: project, title: 'iii', description: '999', labels: [planning, testing, bug, accepting], relative_position: 1) }
+    let!(:issue10) { create(:labeled_issue, project: project, title: 'issue +', description: 'A+ great issue', labels: [a_plus]) }
 
     before do
       visit project_boards_path(project)
@@ -402,6 +404,15 @@ describe 'Issue Boards', :js do
         wait_for_empty_boards((3..4))
       end
 
+      it 'filters by label with encoded character' do
+        set_filter("label", a_plus.title)
+        click_filter_link(a_plus.title)
+        submit_filter
+
+        wait_for_board_cards(1, 1)
+        wait_for_empty_boards((2..4))
+      end
+
       it 'filters by label with space after reload' do
         set_filter("label", "\"#{accepting.title}")
         click_filter_link(accepting.title)

spec/javascripts/boards/utils/query_data_spec.js

+import queryData from '~/boards/utils/query_data';
+
+describe('queryData', () => {
+  it('parses path for label with trailing +', () => {
+    expect(
+      queryData('label_name[]=label%2B', {}),
+    ).toEqual({
+      label_name: ['label+'],
+    });
+  });
+
+  it('parses path for milestone with trailing +', () => {
+    expect(
+      queryData('milestone_title=A%2B', {}),
+    ).toEqual({
+      milestone_title: 'A+',
+    });
+  });
+
+  it('parses path for search terms with spaces', () => {
+    expect(
+      queryData('search=two+words', {}),
+    ).toEqual({
+      search: 'two words',
+    });
+  });
+});