diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-10-09 07:19:14 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-10-09 07:19:14 +0000 |
| commit | 22224279d511c7bdbe3a9206dd77b2df032cc972 (patch) | |
| tree | 2ca39c7b22f28d0d7247619b98239d87c543438e /db/migrate/20170222111732_create_gpg_keys.rb | |
| parent | c7f13eddaaae4e8de849523238aa74253b7ea9af (diff) | |
| parent | f3e51d5415fa6ca2d34783d210e2631555f9a693 (diff) | |
| download | gitlab-ce-rails5.tar.gz | |
Merge branch 'rails5_fix_db_reset' into 'rails5'rails5
[Rails 5] Fix db:migrate:reset-mysql and db:migrate:reset-mysql
See merge request gitlab-org/gitlab-ce!14748
Diffstat (limited to 'db/migrate/20170222111732_create_gpg_keys.rb')
| -rw-r--r-- | db/migrate/20170222111732_create_gpg_keys.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20170222111732_create_gpg_keys.rb b/db/migrate/20170222111732_create_gpg_keys.rb index 541228e8735..c1d83012ce3 100644 --- a/db/migrate/20170222111732_create_gpg_keys.rb +++ b/db/migrate/20170222111732_create_gpg_keys.rb @@ -1,4 +1,4 @@ -class CreateGpgKeys < ActiveRecord::Migration +class CreateGpgKeys < ActiveRecord::Migration[4.2] DOWNTIME = false def change |