summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelogs/unreleased/deprecated-migration-inheritance.yml5
-rw-r--r--db/migrate/20181027114222_add_first_day_of_week_to_user_preferences.rb2
-rw-r--r--db/migrate/20181028120717_add_first_day_of_week_to_application_settings.rb2
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!