diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-16 08:48:23 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-16 08:48:23 +0000 |
| commit | 4a9cf1dc00640fe259113ef0af4cd32a215ab276 (patch) | |
| tree | 7d34e1dfa6274732466b6faee34f6bfa2732fce6 | |
| parent | 076231798dd9716479d8eef118678eeb7c2c7b11 (diff) | |
| parent | 6e9c06f2968b9658c56e6213f4c4fd9314b2a5b4 (diff) | |
| download | gitlab-ce-4a9cf1dc00640fe259113ef0af4cd32a215ab276.tar.gz | |
Merge branch 'backport-milestone-select-change' into 'master'
Backport a change in milestone_select from EE
See merge request gitlab-org/gitlab-ce!14878
| -rw-r--r-- | app/assets/javascripts/milestone_select.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index 951d5e559b4..e7d5325a509 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -146,7 +146,9 @@ import _ from 'underscore'; clicked: function(options) { const { $el, e } = options; let selected = options.selectedObj; + var data, isIssueIndex, isMRIndex, isSelecting, page, boardsStore; + if (!selected) return; page = $('body').attr('data-page'); isIssueIndex = page === 'projects:issues:index'; isMRIndex = (page === page && page === 'projects:merge_requests:index'); |