diff --git a/Gemfile b/Gemfile index c5df09ba..8271eb07 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'rubyzip', '~> 1.2.3' gem 'arbre','1.1.1' gem 'rb-inotify','0.9.10' gem 'public_suffix','3.0.3' -gem 'bourbon','4.2.7' +gem 'bourbon','7.0.0' gem 'mysql2', '~>0.3.20' gem 'omniauth' diff --git a/Gemfile.lock b/Gemfile.lock index 8d88831f..f8d6ace2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,9 +57,8 @@ GEM rack (>= 0.9.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bourbon (4.2.7) - sass (~> 3.4) - thor (~> 0.19) + bourbon (7.0.0) + thor (~> 1.0) builder (3.0.4) cancan (1.6.10) childprocess (0.9.0) @@ -104,7 +103,7 @@ GEM actionmailer (>= 3.0.4) activesupport (>= 3.0.4) execjs (2.7.0) - ffi (1.11.1) + ffi (1.12.2) formtastic (3.1.5) actionpack (>= 3.2.13) formtastic_i18n (0.6.0) @@ -268,7 +267,7 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) tilt (1.4.1) tinymce-rails (5.0.5) @@ -302,7 +301,7 @@ DEPENDENCIES arbre (= 1.1.1) better_errors binding_of_caller - bourbon (= 4.2.7) + bourbon (= 7.0.0) cancan ci_reporter (= 1.9.2) coffee-rails (~> 3.2.1)