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/projects | |
| 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/projects')
| -rw-r--r-- | app/services/projects/detect_repository_languages_service.rb | 2 | ||||
| -rw-r--r-- | app/services/projects/move_project_group_links_service.rb | 2 | ||||
| -rw-r--r-- | app/services/projects/transfer_service.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/services/projects/detect_repository_languages_service.rb b/app/services/projects/detect_repository_languages_service.rb index b020e4d9088..d3680637217 100644 --- a/app/services/projects/detect_repository_languages_service.rb +++ b/app/services/projects/detect_repository_languages_service.rb @@ -29,7 +29,7 @@ module Projects set_detected_repository_languages end - project.repository_languages.reload + project.repository_languages.reset end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/services/projects/move_project_group_links_service.rb b/app/services/projects/move_project_group_links_service.rb index 36afcd0c503..cf4b291c761 100644 --- a/app/services/projects/move_project_group_links_service.rb +++ b/app/services/projects/move_project_group_links_service.rb @@ -26,7 +26,7 @@ module Projects # Remove remaining project group links from source_project def remove_remaining_project_group_links - source_project.reload.project_group_links.destroy_all # rubocop: disable DestroyAll + source_project.reset.project_group_links.destroy_all # rubocop: disable DestroyAll end def group_links_in_target_project diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb index 9458bd6e1f7..91c01eca75c 100644 --- a/app/services/projects/transfer_service.rb +++ b/app/services/projects/transfer_service.rb @@ -30,7 +30,7 @@ module Projects true rescue Projects::TransferService::TransferError => ex - project.reload + project.reset project.errors.add(:new_namespace, ex.message) false end @@ -122,7 +122,7 @@ module Projects def rollback_side_effects rollback_folder_move - project.reload + project.reset update_namespace_and_visibility(@old_namespace) update_repository_configuration(@old_path) end |