diff options
| author | Arinde Eniola <eniolaarinde1@gmail.com> | 2016-04-14 11:16:24 +0100 |
|---|---|---|
| committer | Arinde Eniola <eniolaarinde1@gmail.com> | 2016-04-14 11:16:24 +0100 |
| commit | 5f53ca69ace953bf06afe478072836d083f941ca (patch) | |
| tree | c4163a78a5bc2e0a4d6900991130b2791ba15399 /app/views | |
| parent | 6745e58f8f809a6813ac42fcd2ac82729234df1e (diff) | |
| download | gitlab-ce-5f53ca69ace953bf06afe478072836d083f941ca.tar.gz | |
fix failing tests
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/_label_row.html.haml | 8 | ||||
| -rw-r--r-- | app/views/shared/_labels_row.html.haml | 3 | ||||
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml index f81a04a3c86..9ce5562e667 100644 --- a/app/views/shared/_label_row.html.haml +++ b/app/views/shared/_label_row.html.haml @@ -1,3 +1,5 @@ -- labels.each do |l| - %span.label-row - = link_to_label(l, tooltip: false)
\ No newline at end of file +%span.label-row + %span.label-name + = link_to_label(label, tooltip: false) + %span.prepend-left-10 + = markdown(label.description, pipeline: :single_line)
\ No newline at end of file diff --git a/app/views/shared/_labels_row.html.haml b/app/views/shared/_labels_row.html.haml new file mode 100644 index 00000000000..f81a04a3c86 --- /dev/null +++ b/app/views/shared/_labels_row.html.haml @@ -0,0 +1,3 @@ +- labels.each do |l| + %span.label-row + = link_to_label(l, tooltip: false)
\ No newline at end of file diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index 623ca5ab98f..c14391ada0f 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -48,7 +48,7 @@ .gray-content-block.second-block.filtered-labels - if @labels - = render "shared/label_row", labels: @labels + = render "shared/labels_row", labels: @labels :javascript new UsersSelect(); |