diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-02-11 11:47:34 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-02-11 11:47:34 +0000 |
| commit | 1569389fa2906ffc611c9af955495c794429d45a (patch) | |
| tree | f810cd5211512f0c2b49ca5f8db3f4c2b609ff59 | |
| parent | e927833b941122f25252712bc68b37041b38ba2c (diff) | |
| parent | 3820eca5c47574378b3ddee219287dcb318e2f55 (diff) | |
| download | gitlab-ce-1569389fa2906ffc611c9af955495c794429d45a.tar.gz | |
Merge branch 'deprecated-migration-inheritance' into 'master'
Directly inheriting from ActiveRecord::Migration is deprecated
See merge request gitlab-org/gitlab-ce!25066
3 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/deprecated-migration-inheritance.yml b/changelogs/unreleased/deprecated-migration-inheritance.yml new file mode 100644 index 00000000000..814c511195b --- /dev/null +++ b/changelogs/unreleased/deprecated-migration-inheritance.yml @@ -0,0 +1,5 @@ +--- +title: Directly inheriting from ActiveRecord::Migration is deprecated +merge_request: 25066 +author: Jasper Maes +type: other diff --git a/db/migrate/20181027114222_add_first_day_of_week_to_user_preferences.rb b/db/migrate/20181027114222_add_first_day_of_week_to_user_preferences.rb index a0e76c2186e..96ba5fbd816 100644 --- a/db/migrate/20181027114222_add_first_day_of_week_to_user_preferences.rb +++ b/db/migrate/20181027114222_add_first_day_of_week_to_user_preferences.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class AddFirstDayOfWeekToUserPreferences < ActiveRecord::Migration +class AddFirstDayOfWeekToUserPreferences < ActiveRecord::Migration[5.0] DOWNTIME = false def change diff --git a/db/migrate/20181028120717_add_first_day_of_week_to_application_settings.rb b/db/migrate/20181028120717_add_first_day_of_week_to_application_settings.rb index 53cfaa289f6..e9a8c1011ad 100644 --- a/db/migrate/20181028120717_add_first_day_of_week_to_application_settings.rb +++ b/db/migrate/20181028120717_add_first_day_of_week_to_application_settings.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class AddFirstDayOfWeekToApplicationSettings < ActiveRecord::Migration +class AddFirstDayOfWeekToApplicationSettings < ActiveRecord::Migration[5.0] include Gitlab::Database::MigrationHelpers disable_ddl_transaction! |