1 files changed, 18 insertions, 3 deletions
diff --git a/app/models/concerns/can_move_repository_storage.rb b/app/models/concerns/can_move_repository_storage.rb
index 52c3a4106e3..1132e4e79ac 100644
--- a/app/models/concerns/can_move_repository_storage.rb
+++ b/app/models/concerns/can_move_repository_storage.rb
@@ -16,10 +16,10 @@ module CanMoveRepositoryStorage
         !skip_git_transfer_check && git_transfer_in_progress?
 
       raise RepositoryReadOnlyError, _('Repository already read-only') if
-        self.class.where(id: id).pick(:repository_read_only)
+        _safe_read_repository_read_only_column
 
       raise ActiveRecord::RecordNotSaved, _('Database update failed') unless
-        update_column(:repository_read_only, true)
+        _update_repository_read_only_column(true)
 
       nil
     end
@@ -30,7 +30,7 @@ module CanMoveRepositoryStorage
   def set_repository_writable!
     with_lock do
       raise ActiveRecord::RecordNotSaved, _('Database update failed') unless
-        update_column(:repository_read_only, false)
+        _update_repository_read_only_column(false)
 
       nil
     end
@@ -43,4 +43,19 @@ module CanMoveRepositoryStorage
   def reference_counter(type:)
     Gitlab::ReferenceCounter.new(type.identifier_for_container(self))
   end
+
+  private
+
+  # Not all resources that can move repositories have the `repository_read_only`
+  # in their table, for example groups. We need these methods to override the
+  # behavior in those classes in order to access the column.
+  def _safe_read_repository_read_only_column
+    # This was added originally this way because of
+    # https://gitlab.com/gitlab-org/gitlab/-/commit/43f9b98302d3985312c9f8b66018e2835d8293d2
+    self.class.where(id: id).pick(:repository_read_only)
+  end
+
+  def _update_repository_read_only_column(value)
+    update_column(:repository_read_only, value)
+  end
 end