diff --git a/Gemfile b/Gemfile index 0f50e77..e8315a8 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem 'pg', '~> 0.18.1' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0.1' # Use bootstrap -gem 'bootstrap-sass', '~> 3.3.3' +gem 'bootstrap-sass', '~> 3.4.1' gem "node" gem "twitter-bootstrap-rails" gem 'jquery-ui-bootstrap-rails-asset' diff --git a/Gemfile.lock b/Gemfile.lock index c9ba8a8..69bd514 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,14 +37,13 @@ GEM tzinfo (~> 1.1) addressable (2.4.0) arel (5.0.1.20140414130214) - autoprefixer-rails (5.1.7) + autoprefixer-rails (9.7.4) execjs - json bcrypt (3.1.10) bootbox-rails (0.5.0) - bootstrap-sass (3.3.3) - autoprefixer-rails (>= 5.0.0.1) - sass (>= 3.2.19) + bootstrap-sass (3.4.1) + autoprefixer-rails (>= 5.2.1) + sassc (>= 2.0.0) bootstrap-sass-rails (3.0.3.0) railties (>= 3.1.0) sass-rails (>= 3.1.0) @@ -68,10 +67,10 @@ GEM domain_name (0.5.20160309) unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) - eventmachine (1.0.7) - execjs (2.4.0) + execjs (2.7.0) fastimage (2.0.0) addressable (~> 2) + ffi (1.12.2) hike (1.2.3) http-cookie (1.0.2) domain_name (~> 0.5) @@ -87,15 +86,14 @@ GEM jquery-ui-bootstrap-rails-asset (0.0.3) bootstrap-sass-rails railties (>= 3.1.0) - json (1.8.2) + json (1.8.6) mail (2.6.3) mime-types (>= 1.16, < 3) mime-types (2.4.3) minitest (5.5.1) multi_json (1.11.0) netrc (0.11.0) - node (0.0.2) - eventmachine + node (1.0.0) orm_adapter (0.5.0) pg (0.18.1) puma (2.11.1) @@ -127,6 +125,9 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) rdoc (4.2.0) json (~> 1.4) responders (1.1.2) @@ -135,13 +136,19 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - sass (3.4.13) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (~> 1.1) + sassc (2.2.1) + ffi (~> 1.9) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) @@ -185,7 +192,7 @@ PLATFORMS DEPENDENCIES bootbox-rails - bootstrap-sass (~> 3.3.3) + bootstrap-sass (~> 3.4.1) bosh4r! byebug cancancan