Commit 60aa1a33 authored by Fatih Acet's avatar Fatih Acet

Merge branch...

Merge branch 'ee-6224-extract-ee-specific-files-lines-for-app-views-shared-boards-components' into 'master'

Resolve "Extract EE specific files/lines for app/views/shared/boards/components"

Closes #6224

See merge request gitlab-org/gitlab-ee!6343
parents d6821249 f1da0994
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
%board-delete{ "inline-template" => true, %board-delete{ "inline-template" => true,
":list" => "list", ":list" => "list",
"v-if" => "!list.preset && list.id" } "v-if" => "!list.preset && list.id" }
%button.board-delete.has-tooltip.append-right-10{ type: "button", title: _("Delete list"), "aria-label" => _("Delete list"), data: { placement: "bottom" }, "@click.stop" => "deleteBoard" } %button.board-delete.has-tooltip.float-right{ type: "button", title: _("Delete list"), "aria-label" => _("Delete list"), data: { placement: "bottom" }, "@click.stop" => "deleteBoard" }
= icon("trash") = icon("trash")
.issue-count-badge.clearfix{ "v-if" => 'list.type !== "blank" && list.type !== "promotion"' } .issue-count-badge.clearfix{ "v-if" => 'list.type !== "blank" && list.type !== "promotion"' }
%span.issue-count-badge-count.float-left{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' } %span.issue-count-badge-count.float-left{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' }
...@@ -54,4 +54,4 @@ ...@@ -54,4 +54,4 @@
"ref" => "board-list" } "ref" => "board-list" }
- if can?(current_user, :admin_list, current_board_parent) - if can?(current_user, :admin_list, current_board_parent)
%board-blank-state{ "v-if" => 'list.id == "blank"' } %board-blank-state{ "v-if" => 'list.id == "blank"' }
%board-promotion-state{ "v-if" => 'list.id == "promotion"' } = render_if_exists 'shared/boards/board_promotion_state'
...@@ -7,9 +7,8 @@ ...@@ -7,9 +7,8 @@
%strong %strong
{{ issue.title }} {{ issue.title }}
%br/ %br/
%span< %span
- if @group = render_if_exists "shared/boards/components/sidebar/issue_project_path"
{{ issue.project && issue.project.path }}
= precede "#" do = precede "#" do
{{ issue.iid }} {{ issue.iid }}
%a.gutter-toggle.float-right{ role: "button", %a.gutter-toggle.float-right{ role: "button",
...@@ -19,11 +18,11 @@ ...@@ -19,11 +18,11 @@
= custom_icon("icon_close", size: 15) = custom_icon("icon_close", size: 15)
.js-issuable-update .js-issuable-update
= render "shared/boards/components/sidebar/assignee" = render "shared/boards/components/sidebar/assignee"
= render "shared/boards/components/sidebar/epic" = render_if_exists "shared/boards/components/sidebar/epic"
= render "shared/boards/components/sidebar/milestone" = render "shared/boards/components/sidebar/milestone"
= render "shared/boards/components/sidebar/due_date" = render "shared/boards/components/sidebar/due_date"
= render "shared/boards/components/sidebar/labels" = render "shared/boards/components/sidebar/labels"
= render "shared/boards/components/sidebar/weight" = render_if_exists "shared/boards/components/sidebar/weight"
= render "shared/boards/components/sidebar/notifications" = render "shared/boards/components/sidebar/notifications"
%remove-btn{ ":issue" => "issue", %remove-btn{ ":issue" => "issue",
":issue-update" => "issue.sidebarInfoEndpoint", ":issue-update" => "issue.sidebarInfoEndpoint",
......
%board-promotion-state{ "v-if" => 'list.id == "promotion"' }
- if @group
{{ issue.project && issue.project.path }}
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