From 1c99da4df880bca5ef652243a3501847c0941ca1 Mon Sep 17 00:00:00 2001
From: Scott Bishop <scottbishop70@gmail.com>
Date: Fri, 1 Mar 2019 08:12:04 -0800
Subject: [PATCH] Fix nokogiri and bootstrap-sass dependencies

---
 Gemfile      |  2 +-
 Gemfile.lock | 29 ++++++++++++++++-------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2dcc545..028bd29 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem 'turbolinks', '~> 5.1.0'
 gem 'jbuilder', '~> 2.5'
 
 gem 'bootswatch-rails'
-gem 'bootstrap-sass', '~> 3.3.5'
+gem 'bootstrap-sass', '~> 3.4.1'
 gem 'devise-bootstrap-views'
 gem 'sprockets-rails', require: 'sprockets/railtie'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index bce81cc..d5d88bd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -46,7 +46,7 @@ GEM
     archive-zip (0.11.0)
       io-like (~> 0.3.0)
     arel (8.0.0)
-    autoprefixer-rails (7.1.6)
+    autoprefixer-rails (9.4.9)
       execjs
     bcrypt (3.1.11)
     bcrypt (3.1.11-java)
@@ -57,9 +57,9 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindex (0.5.0)
-    bootstrap-sass (3.3.7)
+    bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
-      sass (>= 3.3.4)
+      sassc (>= 2.0.0)
     bootswatch-rails (3.3.5)
       railties (>= 3.1)
     bugsnag (6.6.3)
@@ -148,7 +148,7 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
     mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     minitest-capybara (0.8.2)
       capybara (~> 2.2)
@@ -175,13 +175,13 @@ GEM
     netrc (0.11.0)
     nio4r (2.1.0)
     nio4r (2.1.0-java)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    nokogiri (1.8.2-java)
-    nokogiri (1.8.2-x64-mingw32)
-      mini_portile2 (~> 2.3.0)
-    nokogiri (1.8.2-x86-mingw32)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.1-java)
+    nokogiri (1.10.1-x64-mingw32)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.1-x86-mingw32)
+      mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
     paperclip (6.0.0)
       activemodel (>= 4.2.0)
@@ -263,8 +263,8 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rmagick (2.16.0)
-    rubyzip (1.2.2)
     ruby-progressbar (1.10.0)
+    rubyzip (1.2.2)
     safe_yaml (1.0.4)
     sass (3.5.2)
       sass-listen (~> 4.0.0)
@@ -277,6 +277,9 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
+    sassc (2.0.1)
+      ffi (~> 1.9)
+      rake
     sdoc (1.0.0)
       rdoc (>= 5.0)
     selenium-webdriver (3.11.0)
@@ -350,7 +353,7 @@ PLATFORMS
 DEPENDENCIES
   ancestry
   better_errors
-  bootstrap-sass (~> 3.3.5)
+  bootstrap-sass (~> 3.4.1)
   bootswatch-rails
   bugsnag (~> 6.6.3)
   byebug