diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-09-07 10:20:27 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-09-07 10:20:27 +0000 |
| commit | 44cb8a7407d3c9df958328088c914c5bedea284f (patch) | |
| tree | 284d9d30036558b8d0be13ec8ba53368e52f6322 /app/assets/javascripts/boards/components | |
| parent | 3276e88bd5d372004a599d4e3cbb3dda6b32a777 (diff) | |
| parent | 8a5121eb8efcd330b518ad0194cd9779a18facf6 (diff) | |
| download | gitlab-ce-44cb8a7407d3c9df958328088c914c5bedea284f.tar.gz | |
Merge branch 'boards-querystring-backport' into 'master'
don't add trailing = when in urlParamsToArray function
See merge request gitlab-org/gitlab-ce!21179
Diffstat (limited to 'app/assets/javascripts/boards/components')
| -rw-r--r-- | app/assets/javascripts/boards/components/modal/index.vue | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/app/assets/javascripts/boards/components/modal/index.vue b/app/assets/javascripts/boards/components/modal/index.vue index 33e72a6782e..7b33a7573e7 100644 --- a/app/assets/javascripts/boards/components/modal/index.vue +++ b/app/assets/javascripts/boards/components/modal/index.vue @@ -1,6 +1,6 @@ <script> /* global ListIssue */ - import queryData from '~/boards/utils/query_data'; + import { urlParamsToObject } from '~/lib/utils/common_utils'; import loadingIcon from '~/vue_shared/components/loading_icon.vue'; import ModalHeader from './header.vue'; import ModalList from './list.vue'; @@ -109,13 +109,11 @@ loadIssues(clearIssues = false) { if (!this.showAddIssuesModal) return false; - return gl.boardService - .getBacklog( - queryData(this.filter.path, { - page: this.page, - per: this.perPage, - }), - ) + return gl.boardService.getBacklog({ + ...urlParamsToObject(this.filter.path), + page: this.page, + per: this.perPage, + }) .then(res => res.data) .then(data => { if (clearIssues) { |