Merge branch '423509_fix_repository_size_limit_assignment' into 'master'

Fix: admin group update logic

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170068



Merged-by: Jason Goodman <jgoodman@gitlab.com>
Approved-by: Jason Goodman <jgoodman@gitlab.com>
Reviewed-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Co-authored-by: Vasilii Iakliushin <viakliushin@gitlab.com>

app/controllers/admin/groups_controller.rb

@@ -53,7 +53,7 @@ def create
   def update
     @group.build_admin_note unless @group.admin_note
 
-    if @group.update(group_params)
+    if Groups::UpdateService.new(@group, current_user, group_params).execute
       unless Gitlab::Utils.to_boolean(group_params['runner_registration_enabled'])
         Ci::Runners::ResetRegistrationTokenService.new(@group, current_user).execute
       end

ee/app/controllers/ee/admin/groups_controller.rb

@@ -38,17 +38,6 @@ def group_members
       def groups
         super.with_deletion_schedule
       end
-
-      override :group_params
-      def group_params
-        modify_group_params(super)
-      end
-
-      def modify_group_params(params)
-        limit = params.delete(:repository_size_limit)
-        params[:repository_size_limit] = ::Gitlab::Utils.try_megabytes_to_bytes(limit) if limit
-        params
-      end
     end
   end
 end

ee/spec/controllers/admin/groups_controller_spec.rb

@@ -31,6 +31,20 @@
     end
   end
 
+  describe 'POST #create', :with_current_organization do
+    subject(:post_request) { post :create, params: { group: params } }
+
+    context 'when repository size limit is provided' do
+      let(:params) { { path: 'test', name: 'test', repository_size_limit: '5000' } }
+
+      it 'creates a group with a correct repository limit' do
+        expect { post_request }.to change { Group.count }.by(1)
+
+        expect(Group.last.repository_size_limit).to eq(5000.megabytes)
+      end
+    end
+  end
+
   describe 'PUT #update' do
     it 'converts the user entered MiB value into bytes' do
       put :update, params: { id: group, group: { repository_size_limit: '5000' } }