diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-27 11:55:42 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-27 11:55:42 +0300 |
commit | 13f6dc1a9476ef2c86538ede8420e915eb999a1c (patch) | |
tree | 9a27afd9dfb922b3ee2e3c1258d4034f3e452088 /app/views/search/results/_merge_request.html.haml | |
parent | c3ad51a0e492108825093e12d441cca90d597a19 (diff) | |
download | gitlab-ce-13f6dc1a9476ef2c86538ede8420e915eb999a1c.tar.gz |
Save search options when switch between filter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/search/results/_merge_request.html.haml')
-rw-r--r-- | app/views/search/results/_merge_request.html.haml | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml index de2a79970c1..96a2e722ba3 100644 --- a/app/views/search/results/_merge_request.html.haml +++ b/app/views/search/results/_merge_request.html.haml @@ -1,14 +1,12 @@ %li - merge request: - = link_to [merge_request.target_project, merge_request] do - %span ##{merge_request.iid} - %strong.term - = truncate merge_request.title, length: 50 - - if merge_request.for_fork? - %span.light (#{merge_request.source_project.name_with_namespace}:#{merge_request.source_branch} → #{merge_request.target_project.name_with_namespace}:#{merge_request.target_branch}) - - else - %span.light (#{merge_request.source_branch} → #{merge_request.target_branch}) - - if merge_request.merged? - %span.label.label-primary Merged - - elsif merge_request.closed? - %span.label.label-danger Closed + %h4 + = link_to [merge_request.target_project, merge_request] do + %span.term.str-truncated= merge_request.title + .pull-right ##{merge_request.iid} + %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 |