diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-15 09:15:10 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-15 09:15:10 +0000 |
| commit | d9a8d9f3de2705a3ab568532f3882dd23b3ce27a (patch) | |
| tree | dd99a05821ae140b9bf2ff917352046acc670154 /db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb | |
| parent | 6cb5b7c8729151c95d1610f0b2f7255fdac2bdec (diff) | |
| parent | 02d9f54f197a28f2d102b7346b1212edb7ddc117 (diff) | |
| download | gitlab-ce-d9a8d9f3de2705a3ab568532f3882dd23b3ce27a.tar.gz | |
Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'
Conflicts:
db/schema.rb
Diffstat (limited to 'db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb')
| -rw-r--r-- | db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb b/db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb index 26b99b61424..c48f1c938d0 100644 --- a/db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb +++ b/db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb @@ -20,7 +20,7 @@ class CleanupMoveSystemUploadFolderSymlink < ActiveRecord::Migration def down if File.directory?(new_directory) say "Symlinking #{old_directory} -> #{new_directory}" - FileUtils.ln_s(new_directory, old_directory) + FileUtils.ln_s(new_directory, old_directory) unless File.exist?(old_directory) else say "#{new_directory} doesn't exist, skipping." end |