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/projects/merge_requests/_merge_request.html.haml | |
| 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/projects/merge_requests/_merge_request.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 84bdde756d4..a10ed02a077 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -8,9 +8,14 @@ = "MERGED" - else %span.pull-right - = "#{merge_request.source_project.path_with_namespace}/#{merge_request.source_branch}" - %i.icon-angle-right - = "#{merge_request.target_project.path_with_namespace}/#{merge_request.target_branch}" + - if merge_request.for_fork? + = "#{merge_request.source_project.path_with_namespace}/#{merge_request.source_branch}" + %i.icon-angle-right + = "#{merge_request.target_project.path_with_namespace}/#{merge_request.target_branch}" + - else + = "#{merge_request.source_branch}" + %i.icon-angle-right + = "#{merge_request.target_branch}" .merge-request-info - if merge_request.author authored by #{link_to_member(merge_request.source_project, merge_request.author)} |