Upgrade bootstrap while we're at it

... so that we can kick the tires once rather than twice.
carbonfive · Jan 30, 2019 · b61e537 · b61e537
1 parent c883745
commit b61e537
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,7 @@ gem "rails", "~> 6.0.0.beta1"
 
 # Front-endy
 gem "autoprefixer-rails"
-gem "bootstrap", "~> 4.1.3"
+gem "bootstrap", "~> 4.2.1"
 gem "coffee-rails"
 gem "jquery-rails"
 gem "sass-rails", require: false # Only needed for generator (e.g. rail g controller Users)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -73,10 +73,10 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.3.2)
       msgpack (~> 1.0)
-    bootstrap (4.1.3)
-      autoprefixer-rails (>= 6.0.3)
-      popper_js (>= 1.12.9, < 2)
-      sass (>= 3.5.2)
+    bootstrap (4.2.1)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 1.14.3, < 2)
+      sassc-rails (>= 2.0.0)
     builder (3.2.3)
     capybara (3.13.2)
       addressable
@@ -303,7 +303,7 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bootsnap
-  bootstrap (~> 4.1.3)
+  bootstrap (~> 4.2.1)
   capybara
   chromedriver-helper
   coffee-rails