diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-01-19 14:25:35 +0000 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-01-20 09:59:12 +0100 |
| commit | 4631981a27d792054d916ca0ab74d886795a8f5b (patch) | |
| tree | 8eb3810ac8ecffe583f1cbef72efaca1cd46b105 | |
| parent | 675da32978284b15ec9a4c8c3bedadebc19c69e4 (diff) | |
| download | gitlab-ce-4631981a27d792054d916ca0ab74d886795a8f5b.tar.gz | |
Merge branch 'milestone-issuable-row-numbers' into 'master'
Fixed some HAML errors on milestone#show
Closes #26799 and #26772
See merge request !8560
| -rw-r--r-- | app/views/shared/milestones/_issuable.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_issuables.html.haml | 3 |
2 files changed, 2 insertions, 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..31eb07ca666 100644 --- a/app/views/shared/milestones/_issuables.html.haml +++ b/app/views/shared/milestones/_issuables.html.haml @@ -8,8 +8,7 @@ = title - if show_counter .right - = issuables.size - .pull-right= number_with_delimiter(issuables.size) + = 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 } |