diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 15:08:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 15:08:49 +0300 |
| commit | 1308dc5eb484ab0f8064989fc551ebdb4b1a7976 (patch) | |
| tree | 614a93d9bf8df34ecfc25c02648329987fb21dde /app/views/projects/merge_requests/creations | |
| parent | f0707f413ce49b5712fca236b950acbec029be1e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/merge_requests/creations')
| -rw-r--r-- | app/views/projects/merge_requests/creations/_new_compare.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/creations/_new_submit.html.haml | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/creations/_new_compare.html.haml b/app/views/projects/merge_requests/creations/_new_compare.html.haml index c6615b26bc0..99537ba8152 100644 --- a/app/views/projects/merge_requests/creations/_new_compare.html.haml +++ b/app/views/projects/merge_requests/creations/_new_compare.html.haml @@ -30,7 +30,8 @@ = dropdown_content = dropdown_loading .card-footer - .text-center= icon('spinner spin', class: 'js-source-loading') + .text-center + .js-source-loading.mt-1.spinner.spinner-sm %ul.list-unstyled.mr_source_commit .col-lg-6 @@ -58,7 +59,8 @@ = dropdown_content = dropdown_loading .card-footer - .text-center= icon('spinner spin', class: "js-target-loading") + .text-center + .js-target-loading.mt-1.spinner.spinner-sm %ul.list-unstyled.mr_target_commit - if @merge_request.errors.any? diff --git a/app/views/projects/merge_requests/creations/_new_submit.html.haml b/app/views/projects/merge_requests/creations/_new_submit.html.haml index 15c83f92474..0fb4d9ae70f 100644 --- a/app/views/projects/merge_requests/creations/_new_submit.html.haml +++ b/app/views/projects/merge_requests/creations/_new_submit.html.haml @@ -47,4 +47,5 @@ = render 'projects/merge_requests/pipelines', endpoint: url_for(safe_params.merge(action: 'pipelines', format: :json)), disable_initialization: true .mr-loading-status - = spinner + .loading.hide + .spinner.spinner-md |