From: Tom Hughes <tom@compton.nu>
Date: Wed, 18 Dec 2019 18:23:42 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2452'
X-Git-Tag: live~3043
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/32fa1246986473126505fd3d3f2687cd7bd19825

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

32fa1246986473126505fd3d3f2687cd7bd19825
diff --cc Gemfile
index 983bf9f92,d77394911..466d73323
--- a/Gemfile
+++ b/Gemfile
@@@ -40,9 -40,9 +40,10 @@@ gem "autoprefixer-rails
  gem "image_optim_rails"
  
  # Load rails plugins
 +gem "actionpack-page_caching", ">= 1.2.0"
  gem "active_record_union"
  gem "activerecord-import"
+ gem "bootstrap", "~> 4.3.1"
  gem "cancancan"
  gem "composite_primary_keys", "~> 12.0.0"
  gem "config"
diff --cc Gemfile.lock
index 0c1707be3,5af33d9a1..cc2d7deaf
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -106,8 -104,12 +106,12 @@@ GE
        debug_inspector (>= 0.0.1)
      bootsnap (1.4.5)
        msgpack (~> 1.0)
+     bootstrap (4.3.1)
+       autoprefixer-rails (>= 9.1.0)
+       popper_js (>= 1.14.3, < 2)
+       sassc-rails (>= 2.0.0)
      browser (2.7.1)
 -    builder (3.2.3)
 +    builder (3.2.4)
      bzip2-ffi (1.0.0)
        ffi (~> 1.0)
      cancancan (3.0.1)