Merge branch 'zj-nillify-pool-repo-when-leaving' into 'master'

Nullify pool_repository when a project leaves

See merge request gitlab-org/gitlab-ce!24225

3 files changed, 17 insertions, 2 deletions

diff --git a/app/models/pool_repository.rb b/app/models/pool_repository.rb
index ad6a008dee8..34220c1b450 100644
--- a/app/models/pool_repository.rb
+++ b/app/models/pool_repository.rb
@@ -85,7 +85,11 @@ class PoolRepository < ActiveRecord::Base
   def unlink_repository(repository)
     object_pool.unlink_repository(repository.raw)
 
-    mark_obsolete unless member_projects.where.not(id: repository.project.id).exists?
+    if member_projects.where.not(id: repository.project.id).exists?
+      true
+    else
+      mark_obsolete
+    end
   end
 
   def object_pool
diff --git a/app/models/project.rb b/app/models/project.rb
index 5439f94c4a9..05aca9c4e51 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2040,7 +2040,7 @@ class Project < ActiveRecord::Base
   end
 
   def leave_pool_repository
-    pool_repository&.unlink_repository(repository)
+    pool_repository&.unlink_repository(repository) && update_column(:pool_repository_id, nil)
   end
 
   private
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index ffbf0960c95..64fbc49913e 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -4443,6 +4443,17 @@ describe Project do
     end
   end
 
+  describe '#leave_pool_repository' do
+    let(:pool) { create(:pool_repository) }
+    let(:project) { create(:project, :repository, pool_repository: pool) }
+
+    it 'removes the membership' do
+      project.leave_pool_repository
+
+      expect(pool.member_projects.reload).not_to include(project)
+    end
+  end
+
   def rugged_config
     rugged_repo(project.repository).config
   end