diff options
| author | winniehell <git@winniehell.de> | 2017-04-14 21:16:04 +0200 |
|---|---|---|
| committer | winniehell <git@winniehell.de> | 2017-04-14 21:26:26 +0200 |
| commit | 35e260b9d19d900a25284d8ec6d3e4a59dadce42 (patch) | |
| tree | ee374d2837e38b499458236e17f8c99c3e39240b | |
| parent | 344a2619bb0e796862531f6784351472e6a70fd7 (diff) | |
| download | gitlab-ce-35e260b9d19d900a25284d8ec6d3e4a59dadce42.tar.gz | |
Move labels of search results from bottom to title (!10705)
| -rw-r--r-- | app/views/search/results/_issue.html.haml | 5 | ||||
| -rw-r--r-- | app/views/search/results/_merge_request.html.haml | 9 | ||||
| -rw-r--r-- | changelogs/unreleased/move-search-labels.yml | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/app/views/search/results/_issue.html.haml b/app/views/search/results/_issue.html.haml index e010f21de5a..fc4385865a4 100644 --- a/app/views/search/results/_issue.html.haml +++ b/app/views/search/results/_issue.html.haml @@ -3,6 +3,8 @@ = confidential_icon(issue) = link_to [issue.project.namespace.becomes(Namespace), issue.project, issue] do %span.term.str-truncated= issue.title + - if issue.closed? + %span.label.label-danger.prepend-left-5 Closed .pull-right ##{issue.iid} - if issue.description.present? .description.term @@ -10,6 +12,3 @@ = search_md_sanitize(issue, :description) %span.light #{issue.project.name_with_namespace} - - if issue.closed? - .pull-right - %span.label.label-danger Closed diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml index 2e6adf3027c..9b583285d02 100644 --- a/app/views/search/results/_merge_request.html.haml +++ b/app/views/search/results/_merge_request.html.haml @@ -2,6 +2,10 @@ %h4 = link_to [merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request] do %span.term.str-truncated= merge_request.title + - if merge_request.merged? + %span.label.label-primary.prepend-left-5 Merged + - elsif merge_request.closed? + %span.label.label-danger.prepend-left-5 Closed .pull-right= merge_request.to_reference - if merge_request.description.present? .description.term @@ -9,8 +13,3 @@ = search_md_sanitize(merge_request, :description) %span.light #{merge_request.project.name_with_namespace} - .pull-right - - if merge_request.merged? - %span.label.label-primary Merged - - elsif merge_request.closed? - %span.label.label-danger Closed diff --git a/changelogs/unreleased/move-search-labels.yml b/changelogs/unreleased/move-search-labels.yml new file mode 100644 index 00000000000..3a1d23d622e --- /dev/null +++ b/changelogs/unreleased/move-search-labels.yml @@ -0,0 +1,4 @@ +--- +title: Move labels of search results from bottom to title +merge_request: 10705 +author: dr |