Commit a2351b6b authored by Robert Speicher's avatar Robert Speicher

Merge branch '6145-extract-app-views-shared-issuable-2-ee' into 'master'

Resolve 2 "Extract EE specific files/lines for app/views/shared/issuable"

See merge request gitlab-org/gitlab-ee!5932
parents 6a4853fc 55f94817
...@@ -748,12 +748,6 @@ ...@@ -748,12 +748,6 @@
} }
} }
.board-milestone-footer-content {
padding-left: 12px;
padding-right: 12px;
color: $gl-gray-dark;
}
.board-config-modal { .board-config-modal {
width: 440px; width: 440px;
......
- boards_page = controller.controller_name == 'boards' - boards_page = controller.controller_name == 'boards'
- board = local_assigns[:board]
.issues-filters .issues-filters
.issues-details-filters.row-content-block.second-block .issues-details-filters.row-content-block.second-block
...@@ -20,7 +19,7 @@ ...@@ -20,7 +19,7 @@
placeholder: "Search assignee", data: { any_user: "Any Assignee", first_user: current_user&.username, null_user: true, current_user: true, project_id: @project&.id, group_id: @group&.id, selected: params[:assignee_id], field_name: "assignee_id", default_label: "Assignee" } }) placeholder: "Search assignee", data: { any_user: "Any Assignee", first_user: current_user&.username, null_user: true, current_user: true, project_id: @project&.id, group_id: @group&.id, selected: params[:assignee_id], field_name: "assignee_id", default_label: "Assignee" } })
.filter-item.inline.milestone-filter .filter-item.inline.milestone-filter
= render "shared/issuable/milestone_dropdown", selected: finder.milestones.try(:first), name: :milestone_title, show_any: true, show_upcoming: true, board: board, show_started: true = render "shared/issuable/milestone_dropdown", selected: finder.milestones.try(:first), name: :milestone_title, show_any: true, show_upcoming: true, show_started: true
.filter-item.inline.labels-filter .filter-item.inline.labels-filter
= render "shared/issuable/label_dropdown", selected: selected_labels, use_id: false, selected_toggle: params[:label_name], data_options: { field_name: "label_name[]" } = render "shared/issuable/label_dropdown", selected: selected_labels, use_id: false, selected_toggle: params[:label_name], data_options: { field_name: "label_name[]" }
......
- project = @target_project || @project - project = @target_project || @project
- extra_class = extra_class || '' - extra_class = extra_class || ''
- show_menu_above = show_menu_above || false - show_menu_above = show_menu_above || false
- board = local_assigns[:board] - selected = local_assigns.fetch(:selected, nil)
- selected = board.try(:milestone) || local_assigns[:selected]
- selected_text = selected.try(:title) || params[:milestone_title] - selected_text = selected.try(:title) || params[:milestone_title]
- dropdown_title = local_assigns.fetch(:dropdown_title, "Filter by milestone") - dropdown_title = local_assigns.fetch(:dropdown_title, "Filter by milestone")
...@@ -22,7 +21,3 @@ ...@@ -22,7 +21,3 @@
Manage milestones Manage milestones
- else - else
View milestones View milestones
- if board
%p.board-milestone-footer-content.js-milestone-footer-content{ style: "display: none;" }
This board's milestone has been set in its configuration.
Edit this value under the board menu.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment