diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2019-04-15 18:52:12 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2019-04-15 18:52:12 +0300 |
commit | 57cdf56aa7df41b013d9c47c6b12bf5a9e20e4f4 (patch) | |
tree | aa4e6e8aa09f2bc845cd36a7abcd7cb00b694c64 /app/services/groups | |
parent | fcb70d9bbbc14dc695fa87dc1dea5fa7fe78f6d2 (diff) | |
parent | 650f40865e5d8136cb366fbde689c4100aafb0c5 (diff) |
Merge branch 'forbid-the-usage-of-reload' into 'master'
Forbid the usage of reload
Closes #60218
See merge request gitlab-org/gitlab-ce!27125
Diffstat (limited to 'app/services/groups')
-rw-r--r-- | app/services/groups/destroy_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/groups/destroy_service.rb b/app/services/groups/destroy_service.rb index 641111aeadc..654fe84e3dc 100644 --- a/app/services/groups/destroy_service.rb +++ b/app/services/groups/destroy_service.rb @@ -20,7 +20,7 @@ module Groups end # reload the relation to prevent triggering destroy hooks on the projects again - group.projects.reload + group.projects.reset group.children.each do |group| # This needs to be synchronous since the namespace gets destroyed below |