summaryrefslogtreecommitdiff
path: root/app/views/projects/blob/_editor.html.haml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-16 18:09:43 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-16 18:09:43 +0000
commit0122d00cac3c058508a2fcb258f12ecfb7bc9055 (patch)
treeb2a0e138ed4113e80588df57b542dc76d5360e2b /app/views/projects/blob/_editor.html.haml
parentf1357e5566b2c1f4f5e7b933b72a2d24431905e9 (diff)
downloadgitlab-ce-0122d00cac3c058508a2fcb258f12ecfb7bc9055.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.haml3
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 a907e175443..87a6b54d697 100644
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@@ -28,7 +28,8 @@
.file-buttons.gl-display-flex.gl-align-items-center.gl-justify-content-end
- if is_markdown
- = render 'shared/blob/markdown_buttons', show_fullscreen_button: false, supports_file_upload: false
+ - unless Feature.enabled?(:source_editor_toolbar, current_user)
+ = render 'shared/blob/markdown_buttons', show_fullscreen_button: false, supports_file_upload: false
%span.soft-wrap-toggle
= render Pajamas::ButtonComponent.new(icon: 'soft-unwrap', button_options: { class: 'no-wrap' }) do
= _("No wrap")