diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-06-07 13:26:24 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-06-07 17:36:08 +0200 |
| commit | 43ce5cf4052111c33dc040074cab26ed789b5999 (patch) | |
| tree | 480294baf7e616ba5b6600a5bb0bd6cb928539dc | |
| parent | 203c77d0932650d38e084a5eaad2cce76f21b02c (diff) | |
| download | gitlab-ce-clean-up-project-for-merge-conflicts.tar.gz | |
Split Project#reset_cache_and_import_attrs upclean-up-project-for-merge-conflicts
In EE we don't want to remove import data for mirrors. By moving this
logic to a separate method we can simply re-define the method in EE
using "prepend" and call "super" whenever necessary.
| -rw-r--r-- | app/models/project.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 0de9d6cb181..4c394646787 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -478,7 +478,11 @@ class Project < ActiveRecord::Base ProjectCacheWorker.perform_async(self.id) end - self.import_data&.destroy + remove_import_data + end + + def remove_import_data + import_data&.destroy end def import_url=(value) |