diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-01-08 13:54:18 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-01-11 13:50:44 +0300 |
| commit | e672ed849484d5ff830ebfe4e3c32b984a6902f2 (patch) | |
| tree | 3e95bf7f5c6821e32de70c05708a158fc25837f3 /app/models/pool_repository.rb | |
| parent | a996e4e3b3fb25b365e4dc6bfb0766cc71f4cae5 (diff) | |
Nullify pool_repository when a project leaves
Previously the nullification wasn't done, as the only caller would later
destroy the model all together. In
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9070 this change
was made. This commit is basically a backport before that MR is merged.
Diffstat (limited to 'app/models/pool_repository.rb')
| -rw-r--r-- | app/models/pool_repository.rb | 6 |
1 files changed, 5 insertions, 1 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 |