diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-15 18:28:21 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-15 18:28:21 +0300 |
| commit | be5b6db883ee634dc53e0a50ac57f424507d7a7d (patch) | |
| tree | 9f4c78713e823b09b2d293f0a9dd7179358d8917 /app/views/projects/merge_requests/_new_compare.html.haml | |
| parent | 3dc347a369783f2a1fec3b6cc724a9b41a43283c (diff) | |
| download | gitlab-ce-be5b6db883ee634dc53e0a50ac57f424507d7a7d.tar.gz | |
Refactor diff suppress logic and diff views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/merge_requests/_new_compare.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_new_compare.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml index 76b5db419f7..99726172154 100644 --- a/app/views/projects/merge_requests/_new_compare.html.haml +++ b/app/views/projects/merge_requests/_new_compare.html.haml @@ -33,7 +33,7 @@ %div= msg - elsif @merge_request.source_branch.present? && @merge_request.target_branch.present? - - if @compare_failed + - if @merge_request.compare_failed .alert.alert-danger %h4 Compare failed %p We can't compare selected branches. It may be because of huge diff or satellite timeout. Please try again or select different branches. |