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 | 5 |
1 files changed, 1 insertions, 4 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 3ca82adccf1..7294c5d321a 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 @@ -7,7 +7,4 @@ %button.btn.btn-sm.btn-close{ "@click" => "acceptDiscardConfirmation(file)" } Discard changes %button.btn.btn-sm{ "@click" => "cancelDiscardConfirmation(file)" } Cancel .editor-wrap{ ":class" => "classObject" } - .loading - .spinner.spinner-md - .editor - %pre{ "style" => "height: 350px" } + .editor{ "style" => "height: 350px", data: { 'editor-loading': true } } |