diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-29 10:48:39 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-29 10:48:39 -0500 |
| commit | a41f5f59cbd1d29d0acc4b9d9782edabf81603b5 (patch) | |
| tree | fcd45bd5f24902480c12179b9b2fbc04778ff0db /app/views/shared/issuable/_milestone_dropdown.html.haml | |
| parent | 2e5cd0f1669eea56c41bb690f28a85c3f98f68ed (diff) | |
| parent | 54957d6932c2b159e01b60ee1d4e191cfdf5b713 (diff) | |
| download | gitlab-ce-a41f5f59cbd1d29d0acc4b9d9782edabf81603b5.tar.gz | |
Merge branch 'master' into issue_3400_portissue_3400_port
# Conflicts:
# app/assets/javascripts/gl_dropdown.js.coffee
Diffstat (limited to 'app/views/shared/issuable/_milestone_dropdown.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_milestone_dropdown.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_milestone_dropdown.html.haml b/app/views/shared/issuable/_milestone_dropdown.html.haml index 0434506c8d7..1c79494f816 100644 --- a/app/views/shared/issuable/_milestone_dropdown.html.haml +++ b/app/views/shared/issuable/_milestone_dropdown.html.haml @@ -1,6 +1,6 @@ - if params[:milestone_title] = hidden_field_tag(:milestone_title, params[:milestone_title]) -= dropdown_tag(h(params[:milestone_title].presence || "Milestone"), options: { title: "Filter by milestone", toggle_class: 'js-milestone-select js-filter-submit', filter: true, dropdown_class: "dropdown-menu-selectable", += dropdown_tag(h(params[:milestone_title].presence || "Milestone"), options: { title: "Filter by milestone", toggle_class: 'js-milestone-select js-filter-submit js-extra-options', filter: true, dropdown_class: "dropdown-menu-selectable", placeholder: "Search milestones", footer_content: @project.present?, data: { show_no: true, show_any: true, field_name: "milestone_title", selected: params[:milestone_title], project_id: @project.try(:id), milestones: milestones_filter_dropdown_path, default_label: "Milestone" } }) do - if @project %ul.dropdown-footer-list |