From db295557f5e2b241f967f99d7aacc03b4682379f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me> Date: Tue, 26 Jun 2018 12:41:09 +0200 Subject: [PATCH] Resolve conflicts in app/views/shared/boards/_show.html.haml and app/views/shared/boards/components/_board.html.haml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable <remy@rymai.me> --- app/views/shared/boards/_show.html.haml | 8 +------- app/views/shared/boards/components/_board.html.haml | 6 +----- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/app/views/shared/boards/_show.html.haml b/app/views/shared/boards/_show.html.haml index d1ebf5d19fc..4fc34997623 100644 --- a/app/views/shared/boards/_show.html.haml +++ b/app/views/shared/boards/_show.html.haml @@ -2,15 +2,9 @@ - group = local_assigns.fetch(:group, false) - @no_breadcrumb_container = true - @no_container = true -<<<<<<< HEAD - @content_class = "issue-boards-content js-focus-mode-board" -- breadcrumb_title "Issue Boards" -- page_title "Boards" -======= -- @content_class = "issue-boards-content" -- breadcrumb_title _("Issue Board") +- breadcrumb_title _("Issue Boards") - page_title _("Boards") ->>>>>>> upstream/master - content_for :page_specific_javascripts do diff --git a/app/views/shared/boards/components/_board.html.haml b/app/views/shared/boards/components/_board.html.haml index 1e6fc5b8015..c0a9d502720 100644 --- a/app/views/shared/boards/components/_board.html.haml +++ b/app/views/shared/boards/components/_board.html.haml @@ -30,11 +30,7 @@ %board-delete{ "inline-template" => true, ":list" => "list", "v-if" => "!list.preset && list.id" } -<<<<<<< HEAD - %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" } ->>>>>>> upstream/master + %button.board-delete.has-tooltip.append-right-10{ type: "button", title: _("Delete list"), "aria-label" => _("Delete list"), data: { placement: "bottom" }, "@click.stop" => "deleteBoard" } = icon("trash") .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 }' } -- 2.30.9