diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
commit | 3b1af5cc7ed2666ff18b718ce5d30fa5a2756674 (patch) | |
tree | 3bc4a40e0ee51ec27eabf917c537033c0c5b14d4 /app/views/projects/blob/_editor.html.haml | |
parent | 9bba14be3f2c211bf79e15769cd9b77bc73a13bc (diff) |
Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42
Diffstat (limited to 'app/views/projects/blob/_editor.html.haml')
-rw-r--r-- | app/views/projects/blob/_editor.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 621cd251bdf..68520d36858 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -26,7 +26,10 @@ dismiss_key: @project.id, human_access: human_access } } - - unless Feature.enabled?(:source_editor_toolbar, current_user) + - if Feature.enabled?(:source_editor_toolbar, current_user) + #editor-toolbar + + - else .file-buttons.gl-display-flex.gl-align-items-center.gl-justify-content-end - if is_markdown .md-header.gl-display-flex.gl-px-2.gl-rounded-base.gl-mx-2.gl-mt-2 @@ -40,8 +43,6 @@ = _("Soft wrap") .file-editor.code - - if Feature.enabled?(:source_editor_toolbar, current_user) - #editor-toolbar .js-edit-mode-pane#editor{ data: { 'editor-loading': true, qa_selector: 'source_editor_preview_container' } }< %pre.editor-loading-content= params[:content] || local_assigns[:blob_data] - if local_assigns[:path] |