summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-12-18 10:10:58 +0000
committerRémy Coutable <remy@rymai.me>2018-12-18 10:10:58 +0000
commit7a143215c33c6746a0b6b35a8503b9fb918cb405 (patch)
treeae4b42dd5489c3fe6632c5febdb402f789d1b515
parent3146bb5c0bd42649e8132a736733b9b0484baaa0 (diff)
parentb9e67b7f3bda09e929f65901c78d9159600949fa (diff)
downloadgitlab-ce-7a143215c33c6746a0b6b35a8503b9fb918cb405.tar.gz
Merge branch 'deprecated-directly-inheriting-migration' into 'master'
Fix deprecation: Directly inheriting from ActiveRecord::Migration is deprecated. See merge request gitlab-org/gitlab-ce!23884
-rw-r--r--changelogs/unreleased/deprecated-directly-inheriting-migration.yml5
-rw-r--r--db/migrate/20181123144235_create_suggestions.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/deprecated-directly-inheriting-migration.yml b/changelogs/unreleased/deprecated-directly-inheriting-migration.yml
new file mode 100644
index 00000000000..2793cc0d44f
--- /dev/null
+++ b/changelogs/unreleased/deprecated-directly-inheriting-migration.yml
@@ -0,0 +1,5 @@
+---
+title: 'Fix deprecation: Directly inheriting from ActiveRecord::Migration is deprecated.'
+merge_request: 23884
+author: Jasper Maes
+type: other
diff --git a/db/migrate/20181123144235_create_suggestions.rb b/db/migrate/20181123144235_create_suggestions.rb
index bcc4d8c538b..1723f6de7eb 100644
--- a/db/migrate/20181123144235_create_suggestions.rb
+++ b/db/migrate/20181123144235_create_suggestions.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class CreateSuggestions < ActiveRecord::Migration
+class CreateSuggestions < ActiveRecord::Migration[5.0]
DOWNTIME = false
def change