summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-11 18:49:34 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-11 18:49:34 +0200
commit15cfa5ca206534f8ffeb6810768f30a21358a82d (patch)
tree62d4ed1e3ece71e75b361046a19340b62afde007 /app/views
parent946b4ceda37fdb475b4176f466ef32470e6aeb1e (diff)
downloadgitlab-ce-15cfa5ca206534f8ffeb6810768f30a21358a82d.tar.gz
Fix automerge
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/merge_requests/widget/open/_check.html.haml7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_check.html.haml b/app/views/projects/merge_requests/widget/open/_check.html.haml
index 5ca2d37a979..e775447cb75 100644
--- a/app/views/projects/merge_requests/widget/open/_check.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_check.html.haml
@@ -1,7 +1,6 @@
-%p
- %strong
- %i.fa.fa-spinner.fa-spin
- Checking automatic merge…
+%strong
+ %i.fa.fa-spinner.fa-spin
+ Checking automatic merge…
:coffeescript
$ ->