diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-07 16:21:49 +0000 |
---|---|---|
committer | Regis <boudinot.regis@yahoo.com> | 2017-06-07 12:55:39 -0600 |
commit | db9db0cc95b096e52021e524959a9db6adab3364 (patch) | |
tree | 26f3fb730d6d178bf1033f884402c3df35db964e | |
parent | 6c7d492e30cc1c04401ebc03996d3edaa68069a1 (diff) | |
download | gitlab-ce-db9db0cc95b096e52021e524959a9db6adab3364.tar.gz |
Merge branch 'bvl-fix-typo-renaming-appearance' into 'security-9-2'
Fix typo in moving the`appearance` folder in migrations
See merge request !2116
-rw-r--r-- | db/migrate/20170316163845_move_uploads_to_system_dir.rb | 2 | ||||
-rw-r--r-- | db/post_migrate/20170606202615_move_appearance_to_system_dir.rb | 57 | ||||
-rw-r--r-- | db/schema.rb | 2 |
3 files changed, 59 insertions, 2 deletions
diff --git a/db/migrate/20170316163845_move_uploads_to_system_dir.rb b/db/migrate/20170316163845_move_uploads_to_system_dir.rb index 7115444c35a..564ee10b5ab 100644 --- a/db/migrate/20170316163845_move_uploads_to_system_dir.rb +++ b/db/migrate/20170316163845_move_uploads_to_system_dir.rb @@ -6,7 +6,7 @@ class MoveUploadsToSystemDir < ActiveRecord::Migration disable_ddl_transaction! DOWNTIME = false - DIRECTORIES_TO_MOVE = %w(user project note group appeareance) + DIRECTORIES_TO_MOVE = %w(user project note group appearance).freeze def up return unless file_storage? diff --git a/db/post_migrate/20170606202615_move_appearance_to_system_dir.rb b/db/post_migrate/20170606202615_move_appearance_to_system_dir.rb new file mode 100644 index 00000000000..561de59ec69 --- /dev/null +++ b/db/post_migrate/20170606202615_move_appearance_to_system_dir.rb @@ -0,0 +1,57 @@ +class MoveAppearanceToSystemDir < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + disable_ddl_transaction! + + DOWNTIME = false + DIRECTORY_TO_MOVE = 'appearance'.freeze + + def up + source = File.join(old_upload_dir, DIRECTORY_TO_MOVE) + destination = File.join(new_upload_dir, DIRECTORY_TO_MOVE) + + move_directory(source, destination) + end + + def down + source = File.join(new_upload_dir, DIRECTORY_TO_MOVE) + destination = File.join(old_upload_dir, DIRECTORY_TO_MOVE) + + move_directory(source, destination) + end + + def move_directory(source, destination) + unless file_storage? + say 'Not using file storage, skipping' + return + end + + unless File.directory?(source) + say "#{source} did not exist, skipping" + return + end + + if File.directory?(destination) + say "#{destination} already existed, skipping" + return + end + + say "Moving #{source} -> #{destination}" + FileUtils.mv(source, destination) + end + + def file_storage? + CarrierWave::Uploader::Base.storage == CarrierWave::Storage::File + end + + def base_directory + Rails.root + end + + def old_upload_dir + File.join(base_directory, "public", "uploads") + end + + def new_upload_dir + File.join(base_directory, "public", "uploads", "system") + end +end diff --git a/db/schema.rb b/db/schema.rb index f7f0599a237..dc867bf655c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170518231126) do +ActiveRecord::Schema.define(version: 20170606202615) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" enable_extension "pg_trgm" |