diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:25:31 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:25:31 +0100 |
| commit | 879d1f9b761f1fb5ddcf9bf6b19f0682b678e37e (patch) | |
| tree | 461c52ffecbedf7e9bd46648a579c8f0755c2e86 /app/views/projects/merge_requests/_new_compare.html.haml | |
| parent | 74a81cbfe3e7b6fb6c3b7a620b07905f19971a86 (diff) | |
| parent | 6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff) | |
| download | gitlab-ce-879d1f9b761f1fb5ddcf9bf6b19f0682b678e37e.tar.gz | |
Merge branch 'master' into ui/issuable-form
Diffstat (limited to 'app/views/projects/merge_requests/_new_compare.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_new_compare.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml index f5a512d385b..cdcb7fde238 100644 --- a/app/views/projects/merge_requests/_new_compare.html.haml +++ b/app/views/projects/merge_requests/_new_compare.html.haml @@ -37,7 +37,7 @@ %h4 Compare failed %p We can't compare selected branches. It may be because of huge diff. Please try again or select different branches. - else - .light-well.append-bottom-10 + .light-well.append-bottom-default .center %h4 There isn't anything to merge. @@ -86,4 +86,3 @@ return; } }); - |