From: Tom Hughes <tom@compton.nu>
Date: Thu, 30 May 2019 08:20:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2237'
X-Git-Tag: live~2559
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b92c699a66fcf6433915ca7771206c61de205a67?hp=e49953f141a8a090e96652335882927ce872e375

Merge remote-tracking branch 'upstream/pull/2237'
---

diff --git a/Gemfile b/Gemfile
index 75b8f7bdc..073ccb5a6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,6 +61,7 @@ gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"
 gem "record_tag_helper"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
+gem "strong_migrations"
 gem "validates_email_format_of", ">= 1.5.1"
 
 # Native OSM extensions
diff --git a/Gemfile.lock b/Gemfile.lock
index 7b871ff7c..a102eb946 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -405,6 +405,8 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    strong_migrations (0.3.1)
+      activerecord (>= 3.2.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     terrapin (0.6.0)
@@ -510,6 +512,7 @@ DEPENDENCIES
   sanitize
   sassc-rails
   secure_headers
+  strong_migrations
   therubyracer
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
diff --git a/config/initializers/strong_migrations.rb b/config/initializers/strong_migrations.rb
new file mode 100644
index 000000000..b1f4707b5
--- /dev/null
+++ b/config/initializers/strong_migrations.rb
@@ -0,0 +1 @@
+StrongMigrations.start_after = 20190518115041 # rubocop:disable Style/NumericLiterals