diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-31 21:10:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-31 21:10:12 +0000 |
| commit | 8bb9ee876910bf5a14e116ace9ec95791486a78a (patch) | |
| tree | 7e2ad1f15f11dcbb5b45b2a581b7d720c272885d /app/views/projects/blob/_editor.html.haml | |
| parent | 04338021ada9669bcf8d6cf2d35b0debf50e8cc1 (diff) | |
| download | gitlab-ce-8bb9ee876910bf5a14e116ace9ec95791486a78a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/blob/_editor.html.haml')
| -rw-r--r-- | app/views/projects/blob/_editor.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 0924e9a35f5..787dc3b030f 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -40,7 +40,8 @@ = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'select2', tabindex: '-1' .file-editor.code - %pre.js-edit-mode-pane.qa-editor#editor{ data: { 'editor-loading': true } }= params[:content] || local_assigns[:blob_data] + .js-edit-mode-pane.qa-editor#editor{ data: { 'editor-loading': true } }< + %pre.editor-loading-content= params[:content] || local_assigns[:blob_data] - if local_assigns[:path] .js-edit-mode-pane#preview.hide .center |