diff options
Diffstat (limited to 'app/views/projects/merge_requests/conflicts/show.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
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}} |