diff --git a/Gemfile b/Gemfile index 0a0406f..ac2733a 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem 'bcrypt', '~> 3.1.7' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development -gem 'bootstrap', '~> 4.0.0' +gem 'bootstrap', '~> 4' gem 'carrierwave' gem 'carrierwave-bombshelter' gem 'carrierwave-i18n' diff --git a/Gemfile.lock b/Gemfile.lock index 49fb3de..b8362c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,15 +48,15 @@ GEM sshkit (>= 1.6.1, != 1.7.0) arel (9.0.0) ast (2.4.0) - autoprefixer-rails (9.5.0) + autoprefixer-rails (9.6.1) execjs bcrypt (3.1.12) bcrypt_pbkdf (1.0.0) bindex (0.5.0) - bootstrap (4.0.0) - autoprefixer-rails (>= 6.0.3) - popper_js (>= 1.12.9, < 2) - sass (>= 3.5.2) + bootstrap (4.3.1) + autoprefixer-rails (>= 9.1.0) + popper_js (>= 1.14.3, < 2) + sassc-rails (>= 2.0.0) builder (3.2.3) capistrano (3.11.0) airbrussh (>= 1.0.0) @@ -117,7 +117,7 @@ GEM activesupport (>= 4.0, < 6) execjs (2.7.0) fastimage (2.1.5) - ffi (1.10.0) + ffi (1.11.1) font-awesome-rails (4.7.0.4) railties (>= 3.2, < 6.0) forwardable-extended (2.6.0) @@ -198,7 +198,7 @@ GEM net-ssh (5.2.0) netaddr (2.0.3) nio4r (2.3.1) - nokogiri (1.10.2) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) parallel (1.16.0) parser (2.6.2.0) @@ -267,7 +267,7 @@ GEM sexp_processor (~> 4.9) rubyzip (1.2.2) safe_yaml (1.0.5) - sass (3.7.3) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -278,6 +278,15 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (2.0.1) + ffi (~> 1.9) + rake + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt selenium-webdriver (3.141.0) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) @@ -336,7 +345,7 @@ PLATFORMS DEPENDENCIES bcrypt (~> 3.1.7) bcrypt_pbkdf - bootstrap (~> 4.0.0) + bootstrap (~> 4) capistrano capistrano-bundler capistrano-passenger