diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-17 18:15:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-17 18:15:22 +0300 |
commit | 2a6300a15aa3e96cdcb2d5efc22c00255d246afd (patch) | |
tree | 4d53125a14c1c29350fe439d2265657e3b4873bb /app | |
parent | 1972a51d40cb3be70fa0e8de3d6b4b48add5cb80 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/groups_controller.rb | 4 | ||||
-rw-r--r-- | app/helpers/groups_helper.rb | 2 | ||||
-rw-r--r-- | app/views/groups/settings/_general.html.haml | 9 |
3 files changed, 5 insertions, 10 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index bd6d9b835c3..b7578bcf465 100644 --- a/app/controllers/groups_controller.rb +++ b/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 diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 0dfc832c457..2ced1bec5e9 100644 --- a/app/helpers/groups_helper.rb +++ b/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) diff --git a/app/views/groups/settings/_general.html.haml b/app/views/groups/settings/_general.html.haml index dc04a2079c9..8c73fc95544 100644 --- a/app/views/groups/settings/_general.html.haml +++ b/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 |