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