diff options
| author | Izaak Alpert <ialpert@blackberry.com> | 2013-07-16 17:14:03 -0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-17 22:48:03 -0400 |
| commit | d99594273d57b2d5ed7c748b3185712960b89478 (patch) | |
| tree | 5f5d6da6011465e3521c7c3ab09ec7a38dbef37a /app/views/search | |
| parent | 128f2845770b7a6d553ee764cdbbe63da5ba9e84 (diff) | |
| download | gitlab-ce-d99594273d57b2d5ed7c748b3185712960b89478.tar.gz | |
Style changes from review with @randx
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow
Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
Diffstat (limited to 'app/views/search')
| -rw-r--r-- | app/views/search/_result.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/search/_result.html.haml b/app/views/search/_result.html.haml index 064c683e3d7..59c7738019b 100644 --- a/app/views/search/_result.html.haml +++ b/app/views/search/_result.html.haml @@ -26,7 +26,10 @@ %span ##{merge_request.id} %strong.term = truncate merge_request.title, length: 50 - %span.light (#{merge_request.source_project.name_with_namespace}:#{merge_request.source_branch} → #{merge_request.target_project.name_with_namespace}:#{merge_request.target_branch}) + - 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}) - @issues.each do |issue| %li issue: |