From d92f1abafe790e2a14161b1f096e39e0dd6e777b Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Fri, 13 Jan 2017 08:54:20 -0500 Subject: [PATCH 1/2] Fixed some HAML errors on milestone#show The issuable reference wasn't correctly rendered on the page 2 counts where rendered in the top bar of the panel --- app/views/shared/milestones/_issuable.html.haml | 2 +- app/views/shared/milestones/_issuables.html.haml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/shared/milestones/_issuable.html.haml b/app/views/shared/milestones/_issuable.html.haml index 51c195ffbcd..28935c8b598 100644 --- a/app/views/shared/milestones/_issuable.html.haml +++ b/app/views/shared/milestones/_issuable.html.haml @@ -16,7 +16,7 @@ = link_to_gfm issuable.title, [project.namespace.becomes(Namespace), project, issuable], title: issuable.title .issuable-detail = link_to [project.namespace.becomes(Namespace), project, issuable] do - %span.issuable-number >= issuable.to_reference + %span.issuable-number= issuable.to_reference - issuable.labels.each do |label| = link_to polymorphic_path(base_url_args, { milestone_title: @milestone.title, label_name: label.title, state: 'all' }) do diff --git a/app/views/shared/milestones/_issuables.html.haml b/app/views/shared/milestones/_issuables.html.haml index c8fd45c4319..d7eed9e7418 100644 --- a/app/views/shared/milestones/_issuables.html.haml +++ b/app/views/shared/milestones/_issuables.html.haml @@ -7,8 +7,6 @@ .left = title - if show_counter - .right - = issuables.size .pull-right= number_with_delimiter(issuables.size) - class_prefix = dom_class(issuables).pluralize From bbd713280a62f4927249576944b2aac555408be9 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Wed, 18 Jan 2017 17:08:09 +0000 Subject: [PATCH 2/2] Replaced `.pull-right` with `.right` --- app/views/shared/milestones/_issuables.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/shared/milestones/_issuables.html.haml b/app/views/shared/milestones/_issuables.html.haml index d7eed9e7418..31eb07ca666 100644 --- a/app/views/shared/milestones/_issuables.html.haml +++ b/app/views/shared/milestones/_issuables.html.haml @@ -7,7 +7,8 @@ .left = title - if show_counter - .pull-right= number_with_delimiter(issuables.size) + .right + = number_with_delimiter(issuables.size) - class_prefix = dom_class(issuables).pluralize %ul{ class: "well-list #{class_prefix}-sortable-list", id: "#{class_prefix}-list-#{id}", "data-state" => id }