diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-15 16:46:51 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-15 16:46:51 +0000 |
| commit | 6d4a0325f13069fd5c69a3a6520de73f67783200 (patch) | |
| tree | e5aa85623d43c0765ef4033618b9e864692a623c | |
| parent | 26810dd77111c396891d20f9a4c688bc05c84044 (diff) | |
| parent | ad48b1251b5dff1dbbf84d70ec7a2f8224370456 (diff) | |
| download | gitlab-ce-6d4a0325f13069fd5c69a3a6520de73f67783200.tar.gz | |
Merge branch 'ce-6145-extract-app-views-shared-issuable-2' into 'master'
CE: Resolve 2 "Extract EE specific files/lines for app/views/shared/issuable"
See merge request gitlab-org/gitlab-ce!19772
| -rw-r--r-- | app/views/shared/issuable/_milestone_dropdown.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/shared/issuable/_milestone_dropdown.html.haml b/app/views/shared/issuable/_milestone_dropdown.html.haml index 955b8866c2c..37625a4a163 100644 --- a/app/views/shared/issuable/_milestone_dropdown.html.haml +++ b/app/views/shared/issuable/_milestone_dropdown.html.haml @@ -1,6 +1,8 @@ - project = @target_project || @project - extra_class = extra_class || '' - show_menu_above = show_menu_above || false +- selected = local_assigns.fetch(:selected, nil) + - selected_text = selected.try(:title) || params[:milestone_title] - dropdown_title = local_assigns.fetch(:dropdown_title, "Filter by milestone") - if selected.present? || params[:milestone_title].present? |