Add latest changes from gitlab-org/gitlab@master

app/controllers/groups_controller.rb

@@ -38,10 +38,6 @@ class GroupsController < Groups::ApplicationController
     push_force_frontend_feature_flag(:work_items, group.work_items_feature_flag_enabled?)
   end
 
-  before_action only: :show do
-    push_frontend_feature_flag(:show_group_readme, group)
-  end
-
   helper_method :captcha_required?
 
   skip_cross_project_access_check :index, :new, :create, :edit, :update, :destroy, :projects

app/helpers/groups_helper.rb

@@ -167,7 +167,7 @@ module GroupsHelper
   end
 
   def show_group_readme?(group)
-    Feature.enabled?(:show_group_readme, group) && group.group_readme
+    group.group_readme
   end
 
   def group_settings_readme_app_data(group)

app/views/groups/settings/_general.html.haml

@@ -19,11 +19,10 @@
         = f.label :description, s_('Groups|Group description (optional)'), class: 'label-bold'
         = f.text_area :description, class: 'form-control', rows: 3, maxlength: 250
 
-    - if Feature.enabled?(:show_group_readme, @group)
-      .row.gl-mt-3
-        .form-group.col-md-5
-          = f.label :description, s_('Groups|Group README'), class: 'label-bold'
-          #js-group-settings-readme{ data: group_settings_readme_app_data(@group) }
+    .row.gl-mt-3
+      .form-group.col-md-5
+        = f.label :description, s_('Groups|Group README'), class: 'label-bold'
+        #js-group-settings-readme{ data: group_settings_readme_app_data(@group) }
 
   = render 'shared/repository_size_limit_setting_registration_features_cta', form: f
   = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group

config/feature_flags/development/show_group_readme.yml

@@ -1,8 +0,0 @@
----
-name: show_group_readme
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109480
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390230
-milestone: '15.9'
-type: development
-group: group::tenant scale
-default_enabled: false

doc/user/group/manage.md

@@ -249,8 +249,6 @@ To change this setting globally, see [Default project creation protection](../ad
 
 ## Add Group README
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/390230) in GitLab 15.11 [with a flag](../../administration/feature_flags.md) named `show_group_readme`. Disabled by default.
-
 As a group owner or member, you can use a README to provide more information about your team, and invite users to contribute to your projects.
 The README is displayed on the group overview page, and can be changed in the group settings. All group members can edit the README.
 

spec/features/groups/group_settings_spec.rb

@@ -305,16 +305,6 @@ RSpec.describe 'Edit group settings', feature_category: :subgroups do
         end
       end
     end
-
-    describe 'with :show_group_readme FF false' do
-      before do
-        stub_feature_flags(show_group_readme: false)
-      end
-
-      it 'does not render Group README settings' do
-        expect(page).not_to have_text('README')
-      end
-    end
   end
 
   def update_path(new_group_path)

spec/features/groups_spec.rb

@@ -513,39 +513,15 @@ RSpec.describe 'Group', feature_category: :subgroups do
   end
 
   describe 'group README', :js do
-    describe 'with :show_group_readme FF true' do
-      before do
-        stub_feature_flags(show_group_readme: true)
-      end
+    context 'with gitlab-profile project and README.md' do
+      let_it_be(:group) { create(:group) }
+      let_it_be(:project) { create(:project, :readme, namespace: group) }
 
-      context 'with gitlab-profile project and README.md' do
-        let_it_be(:group) { create(:group) }
-        let_it_be(:project) { create(:project, :readme, namespace: group) }
+      it 'renders README block on group page' do
+        visit group_path(group)
+        wait_for_requests
 
-        it 'renders README block on group page' do
-          visit group_path(group)
-          wait_for_requests
-
-          expect(page).to have_text('README.md')
-        end
-      end
-    end
-
-    describe 'with :show_group_readme FF false' do
-      before do
-        stub_feature_flags(show_group_readme: false)
-      end
-
-      context 'with gitlab-profile project and README.md' do
-        let_it_be(:group) { create(:group) }
-        let_it_be(:project) { create(:project, :readme, namespace: group) }
-
-        it 'does not render README block on group page' do
-          visit group_path(group)
-          wait_for_requests
-
-          expect(page).not_to have_text('README.md')
-        end
+        expect(page).to have_text('README.md')
       end
     end
   end

spec/views/groups/settings/_general.html.haml_spec.rb

@@ -12,28 +12,10 @@ RSpec.describe 'groups/settings/_general.html.haml', feature_category: :subgroup
       allow(view).to receive(:current_user).and_return(user)
     end
 
-    describe 'with :show_group_readme FF true' do
-      before do
-        stub_feature_flags(show_group_readme: true)
-      end
+    it 'renders #js-group-settings-readme' do
+      render
 
-      it 'renders #js-group-settings-readme' do
-        render
-
-        expect(rendered).to have_selector('#js-group-settings-readme')
-      end
-    end
-
-    describe 'with :show_group_readme FF false' do
-      before do
-        stub_feature_flags(show_group_readme: false)
-      end
-
-      it 'does not render #js-group-settings-readme' do
-        render
-
-        expect(rendered).not_to have_selector('#js-group-settings-readme')
-      end
+      expect(rendered).to have_selector('#js-group-settings-readme')
     end
   end
 end

spec/views/groups/show.html.haml_spec.rb

@@ -11,63 +11,27 @@ RSpec.describe 'groups/show', feature_category: :subgroups do
       assign(:group, group)
     end
 
-    describe 'with :show_group_readme FF true' do
+    context 'with readme project' do
       before do
-        stub_feature_flags(show_group_readme: true)
+        allow(group).to receive(:group_readme).and_return(readme_project)
       end
 
-      context 'with readme project' do
-        before do
-          allow(group).to receive(:group_readme).and_return(readme_project)
-        end
+      it 'renders #js-group-readme' do
+        render
 
-        it 'renders #js-group-readme' do
-          render
-
-          expect(rendered).to have_selector('#js-group-readme')
-        end
-      end
-
-      context 'without readme project' do
-        before do
-          allow(group).to receive(:group_readme).and_return(nil)
-        end
-
-        it 'does not render #js-group-readme' do
-          render
-
-          expect(rendered).not_to have_selector('#js-group-readme')
-        end
+        expect(rendered).to have_selector('#js-group-readme')
       end
     end
 
-    describe 'with :show_group_readme FF false' do
+    context 'without readme project' do
       before do
-        stub_feature_flags(show_group_readme: false)
+        allow(group).to receive(:group_readme).and_return(nil)
       end
 
-      context 'with readme project' do
-        before do
-          allow(group).to receive(:group_readme).and_return(readme_project)
-        end
+      it 'does not render #js-group-readme' do
+        render
 
-        it 'does not render #js-group-readme' do
-          render
-
-          expect(rendered).not_to have_selector('#js-group-readme')
-        end
-      end
-
-      context 'without readme project' do
-        before do
-          allow(group).to receive(:group_readme).and_return(nil)
-        end
-
-        it 'does not render #js-group-readme' do
-          render
-
-          expect(rendered).not_to have_selector('#js-group-readme')
-        end
+        expect(rendered).not_to have_selector('#js-group-readme')
       end
     end
   end