diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 12:08:49 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 12:08:49 +0000 |
| commit | 1308dc5eb484ab0f8064989fc551ebdb4b1a7976 (patch) | |
| tree | 614a93d9bf8df34ecfc25c02648329987fb21dde /app/views/projects/merge_requests/conflicts | |
| parent | f0707f413ce49b5712fca236b950acbec029be1e (diff) | |
| download | gitlab-ce-1308dc5eb484ab0f8064989fc551ebdb4b1a7976.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/merge_requests/conflicts')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml b/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml index aff3fb82fa6..3ca82adccf1 100644 --- a/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml +++ b/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml @@ -8,6 +8,6 @@ %button.btn.btn-sm{ "@click" => "cancelDiscardConfirmation(file)" } Cancel .editor-wrap{ ":class" => "classObject" } .loading - %i.fa.fa-spinner.fa-spin + .spinner.spinner-md .editor %pre{ "style" => "height: 350px" } diff --git a/app/views/projects/merge_requests/conflicts/show.html.haml b/app/views/projects/merge_requests/conflicts/show.html.haml index f48390aa046..d933675eac5 100644 --- a/app/views/projects/merge_requests/conflicts/show.html.haml +++ b/app/views/projects/merge_requests/conflicts/show.html.haml @@ -11,7 +11,7 @@ #conflicts{ "v-cloak" => "true", data: { conflicts_path: conflicts_project_merge_request_path(@merge_request.project, @merge_request, format: :json), resolve_conflicts_path: resolve_conflicts_project_merge_request_path(@merge_request.project, @merge_request) } } .loading{ "v-if" => "isLoading" } - %i.fa.fa-spinner.fa-spin + .spinner.spinner-md .nothing-here-block{ "v-if" => "hasError" } {{conflictsData.errorMessage}} |