diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-02 00:08:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-02 00:08:09 +0300 |
| commit | 3902d464d6045c2f5f6b687c0acf3254d7458928 (patch) | |
| tree | 6a814f69362ef173d0a411ce516321aeb91685f7 /app/assets/javascripts/milestone_select.js | |
| parent | d7ed3b4766871c30f50736c1d9eedc46c4035841 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/milestone_select.js')
| -rw-r--r-- | app/assets/javascripts/milestone_select.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index e14212254a8..caa45184bfc 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -130,10 +130,13 @@ export default class MilestoneSelect { fieldName: $dropdown.data('fieldName'), text: milestone => escape(milestone.title), id: milestone => { - if (!useId && !$dropdown.is('.js-issuable-form-dropdown')) { - return milestone.name; + if (milestone !== undefined) { + if (!useId && !$dropdown.is('.js-issuable-form-dropdown')) { + return milestone.name; + } + + return milestone.id; } - return milestone.id; }, hidden: () => { $selectBox.hide(); |