Automatic merge of gitlab-org/gitlab master

GITALY_SERVER_VERSION

-092d4e489d7de1dcc38d57a4c667e85df8b8377f
+6aabab39e06f8a4f786a99449a49d5f0cb332310

changelogs/unreleased/235460_remove_sse_erb_support_feature_flag.yml

+---
+title: Add support for .md.erb files in Static Site Editor
+merge_request: 42353
+author:
+type: added

config/feature_flags/development/sse_erb_support.yml

----
-name: sse_erb_support
-introduced_by_url:
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235460
-group: group::static site editor
-type: development
-default_enabled: false

doc/administration/operations/extra_sidekiq_processes.md

@@ -112,7 +112,8 @@ you list:
 
 ## Queue selector (experimental)
 
-> [Introduced](https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/45) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.8.
+> - [Introduced](https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/45) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.8.
+> - [Sidekiq cluster including queue selector moved](https://gitlab.com/groups/gitlab-com/gl-infra/-/epics/181) to GitLab [Core](https://about.gitlab.com/pricing/#self-managed) in GitLab 12.10.
 
 CAUTION: **Caution:**
 As this is marked as **experimental**, it is subject to change at any
@@ -130,6 +131,9 @@ in a more general way using the following components:
 - Attributes that can be selected.
 - Operators used to construct a query.
 
+When `experimental_queue_selector` is set, all `queue_groups` must be in
+the queue selector syntax.
+
 ### Available attributes
 
 - [Introduced](https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/261) in GitLab 13.1, `tags`.

lib/gitlab/static_site_editor/config/generated_config.rb

@@ -34,7 +34,7 @@ module Gitlab
         delegate :project, to: :repository
 
         def supported_extensions
-          %w[.md].freeze
+          %w[.md .md.erb].freeze
         end
 
         def commit_id
@@ -50,8 +50,6 @@ module Gitlab
         end
 
         def extension_supported?
-          return true if path.end_with?('.md.erb') && Feature.enabled?(:sse_erb_support, project)
-
           supported_extensions.any? { |ext| path.end_with?(ext) }
         end
 

spec/lib/gitlab/static_site_editor/config/generated_config_spec.rb

@@ -58,27 +58,11 @@ RSpec.describe Gitlab::StaticSiteEditor::Config::GeneratedConfig do
         )
       end
 
-      context 'when feature flag is enabled' do
-        let(:path) { 'FEATURE_ON.md.erb' }
-
-        before do
-          stub_feature_flags(sse_erb_support: project)
-        end
+      let(:path) { 'README.md.erb' }
 
       it { is_expected.to include(is_supported_content: true) }
     end
 
-      context 'when feature flag is disabled' do
-        let(:path) { 'FEATURE_OFF.md.erb' }
-
-        before do
-          stub_feature_flags(sse_erb_support: false)
-        end
-
-        it { is_expected.to include(is_supported_content: false) }
-      end
-    end
-
     context 'when file path is nested' do
       let(:path) { 'lib/README.md' }