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

diff --git a/Gemfile b/Gemfile
index 75b8f7bdc4ba6e8c5bb3d7706aeee0c93c340c0b..073ccb5a66dab3ad01e863d5d60e3ae569b46df4 100644 (file)
--- 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 7b871ff7cfb28b5503382118e232e52556056815..a102eb946f144e7dd6c9253e3deed1ebf4a2d596 100644 (file)
--- 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 (file)
index 0000000..b1f4707
--- /dev/null
+++ b/config/initializers/strong_migrations.rb
@@ -0,0 +1 @@
+StrongMigrations.start_after = 20190518115041 # rubocop:disable Style/NumericLiterals