diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index aff70f248c2b9b05ed58239c10601cd2eaf158ce..d403d4e5c0323ec7e34b45a013264d4da44c3c0d 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -19,21 +19,17 @@ - input_options = { label: _('File name'), id: 'file_name', name: 'file_name', value: params[:file_name] || '', required: true, placeholder: "Filename", testid: 'file-name-field', class: 'new-file-name js-file-path-name-input' } = render 'filepath_form', input_options: input_options - - if Feature.enabled?(:source_editor_toolbar, current_user) - #editor-toolbar - - - else - .file-buttons.gl-flex.gl-items-center.gl-justify-end - - if is_markdown - .md-header.gl-flex.gl-px-2.gl-rounded-base.gl-mx-2.gl-mt-2 - .gl-flex.gl-items-center.gl-flex-wrap.gl-justify-between - .md-header-toolbar.gl-flex.gl-py-2.gl-flex-wrap{ class: "!gl-m-0" } - = render 'shared/blob/markdown_buttons', supports_file_upload: false - %span.soft-wrap-toggle - = render Pajamas::ButtonComponent.new(icon: 'soft-unwrap', button_options: { class: 'no-wrap' }) do - = _("No wrap") - = render Pajamas::ButtonComponent.new(icon: 'soft-wrap', button_options: { class: 'soft-wrap' }) do - = _("Soft wrap") + .file-buttons.gl-flex.gl-items-center.gl-justify-end + - if is_markdown + .md-header.gl-flex.gl-px-2.gl-rounded-base.gl-mx-2.gl-mt-2 + .gl-flex.gl-items-center.gl-flex-wrap.gl-justify-between + .md-header-toolbar.gl-flex.gl-py-2.gl-flex-wrap{ class: "!gl-m-0" } + = render 'shared/blob/markdown_buttons', supports_file_upload: false + %span.soft-wrap-toggle + = render Pajamas::ButtonComponent.new(icon: 'soft-unwrap', button_options: { class: 'no-wrap' }) do + = _("No wrap") + = render Pajamas::ButtonComponent.new(icon: 'soft-wrap', button_options: { class: 'soft-wrap' }) do + = _("Soft wrap") .file-editor.code .js-edit-mode-pane#editor{ data: { 'editor-loading': true, testid: 'source-editor-preview-container', ref: ref} }< diff --git a/config/feature_flags/development/source_editor_toolbar.yml b/config/feature_flags/development/source_editor_toolbar.yml deleted file mode 100644 index 6d8a749b945c7745b26038bceb1e5e543f641e8d..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/source_editor_toolbar.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: source_editor_toolbar -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82304 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354748 -milestone: '14.9' -type: development -group: group::source code -default_enabled: false diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index fa1a34702b559de525cd53e8f204b73f478179e8..b2f344b6ed04b90e7e46e710b2e03382db729fe0 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -81,7 +81,6 @@ def add_gon_variables # Initialize gon.features with any flags that should be # made globally available to the frontend - push_frontend_feature_flag(:source_editor_toolbar) push_frontend_feature_flag(:vscode_web_ide, current_user) push_frontend_feature_flag(:ui_for_organizations, current_user) push_frontend_feature_flag(:organization_switching, current_user) diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb index c47143cde44878f5ada2d40f392180bf74bdfecb..447599f604606e5dcb15f0ca5062324c367735f9 100644 --- a/spec/features/projects/blobs/edit_spec.rb +++ b/spec/features/projects/blobs/edit_spec.rb @@ -107,13 +107,7 @@ def has_toolbar_buttons end end - it "has defined set of toolbar buttons when the flag is on" do - stub_feature_flags(source_editor_toolbar: true) - has_toolbar_buttons - end - - it "has defined set of toolbar buttons when the flag is off" do - stub_feature_flags(source_editor_toolbar: false) + it "has defined set of toolbar buttons" do has_toolbar_buttons end end