From 4cd14ed1c254d03a42e35226a83b297e4212ab63 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Sun, 17 Mar 2019 18:06:09 +0530 Subject: [PATCH] Handle migration from rails 4.2 --- debian/patches/0680-rails-5-migrations.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 21 insertions(+) create mode 100644 debian/patches/0680-rails-5-migrations.patch diff --git a/debian/patches/0680-rails-5-migrations.patch b/debian/patches/0680-rails-5-migrations.patch new file mode 100644 index 0000000000..f4d5239b55 --- /dev/null +++ b/debian/patches/0680-rails-5-migrations.patch @@ -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! + diff --git a/debian/patches/series b/debian/patches/series index 12fd9d7795..563e8b99ca 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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