summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/show.html.haml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-13 12:08:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-13 12:08:49 +0000
commit1308dc5eb484ab0f8064989fc551ebdb4b1a7976 (patch)
tree614a93d9bf8df34ecfc25c02648329987fb21dde /app/views/projects/merge_requests/show.html.haml
parentf0707f413ce49b5712fca236b950acbec029be1e (diff)
downloadgitlab-ce-1308dc5eb484ab0f8064989fc551ebdb4b1a7976.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/merge_requests/show.html.haml')
-rw-r--r--app/views/projects/merge_requests/show.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml
index 310cd355d22..d65c874f245 100644
--- a/app/views/projects/merge_requests/show.html.haml
+++ b/app/views/projects/merge_requests/show.html.haml
@@ -88,7 +88,8 @@
show_whitespace_default: @show_whitespace_default.to_s }
.mr-loading-status
- = spinner
+ .loading.hide
+ .spinner.spinner-md
= render 'shared/issuable/sidebar', issuable_sidebar: @issuable_sidebar, assignees: @merge_request.assignees