diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-10-11 16:06:07 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-10-11 16:06:07 +0000 |
| commit | 27dfc9f0ff67a439b4185df04817c6c5f93c23b4 (patch) | |
| tree | a99e07c0f8ae37a540d5a1f3a439fb2553323871 /app | |
| parent | f60317f414eb97acc515547afd37243b0956d0f6 (diff) | |
| parent | fbb5953ec36ae3e53f9a07f5a0d1cf1b5e1ef209 (diff) | |
| download | gitlab-ce-27dfc9f0ff67a439b4185df04817c6c5f93c23b4.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 05e14c578b5..c7ca322853f 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1789,7 +1789,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? |