Handle migration from rails 4.2

This commit is contained in:
Pirate Praveen 2019-03-17 18:06:09 +05:30
parent 094e408385
commit 4cd14ed1c2
2 changed files with 21 additions and 0 deletions

View file

@ -0,0 +1,20 @@
--- 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[4.2]
DOWNTIME = false
def change
--- 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[4.2]
include Gitlab::Database::MigrationHelpers
disable_ddl_transaction!

View file

@ -22,6 +22,7 @@
0660-fix-gitlab-yml-path.patch
0670-allow-doorkeepr-4_3.patch
0680-rails-5_1.patch
0680-rails-5-migrations.patch
0685-bump-fog.patch
0686-rails-5.1-embed.patch
0687-opentracing-embed.patch