diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-10-11 16:06:07 +0000 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-10-11 16:32:09 -0500 |
| commit | 37308a9a9b6ba05fb6e06a9188e947ada2318ba9 (patch) | |
| tree | e3a679592b193eb96426bc7a011c19b3dd39af7b /app | |
| parent | bb8ee95df680c4798326dd38ac021e166bed807e (diff) | |
| download | gitlab-ce-37308a9a9b6ba05fb6e06a9188e947ada2318ba9.tar.gz | |
Merge branch 'sh-fix-project-deletion-with-export' into 'master'
Fix project deletion when there is a export available
Closes #52362
See merge request gitlab-org/gitlab-ce!22276
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 0cdd876dc20..cb63520f593 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1781,7 +1781,7 @@ class Project < ActiveRecord::Base return unless export_file_exists? import_export_upload.remove_export_file! - import_export_upload.save + import_export_upload.save unless import_export_upload.destroyed? end def export_file_exists? |