diff --git a/Gemfile b/Gemfile index b0c92a1..01d1fbe 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'sqlite3' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0.1' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' +gem 'uglifier', '~> 2.7.0' # Use CoffeeScript for .js.coffee assets and views gem 'coffee-rails', '~> 4.1.0' # See https://github.com/sstephenson/execjs#readme for more supported runtimes @@ -31,7 +31,7 @@ gem 'coveralls', '~> 0.7.2', require: false gem 'bootstrap-sass', '~> 3.3.1' gem 'autoprefixer-rails' -gem 'bh', '~> 1.2' +gem 'bh', '~> 1.3.1' gem 'will_paginate', '~> 3.0.6' gem 'will_paginate-bootstrap' diff --git a/Gemfile.lock b/Gemfile.lock index b6b94f5..b116ab1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,16 +37,18 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.0) - autoprefixer-rails (4.0.2.2) + autoprefixer-rails (5.1.5) execjs + json bcrypt (3.1.10) - bh (1.2.0) + bh (1.3.1) actionpack activesupport binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.1.0) - sass (~> 3.2) + bootstrap-sass (3.3.3) + autoprefixer-rails (>= 5.0.0.1) + sass (>= 3.2.19) builder (3.2.2) codemirror-rails (4.8) railties (>= 3.0, < 5) @@ -56,13 +58,13 @@ GEM coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.8.0) - coveralls (0.7.2) - multi_json (~> 1.3) - rest-client (= 1.6.7) - simplecov (>= 0.7) - term-ansicolor (= 1.2.2) - thor (= 0.18.1) + coffee-script-source (1.9.0) + coveralls (0.7.9) + multi_json (~> 1.10) + rest-client (~> 1.7) + simplecov (~> 0.9.1) + term-ansicolor (~> 1.3) + thor (~> 0.19.1) debug_inspector (0.0.2) devise (3.4.1) bcrypt (~> 3.0) @@ -74,8 +76,9 @@ GEM devise-bootstrap-views (0.0.4) docile (1.1.5) erubis (2.7.0) - execjs (2.2.2) - globalid (0.3.0) + execjs (2.3.0) + ffi (1.9.6) + globalid (0.3.2) activesupport (>= 4.1.0) hike (1.2.3) i18n (0.7.0) @@ -86,7 +89,7 @@ GEM rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.1) + json (1.8.2) loofah (2.0.1) nokogiri (>= 1.5.9) mail (2.6.3) @@ -95,13 +98,14 @@ GEM railties (>= 3.0) mime-types (2.4.3) mini_portile (0.6.2) - minitest (5.5.0) + minitest (5.5.1) multi_json (1.10.1) - nokogiri (1.6.5) + netrc (0.10.2) + nokogiri (1.6.6.2) mini_portile (~> 0.6.0) orm_adapter (0.5.0) rack (1.6.0) - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (4.2.0) actionmailer (= 4.2.0) @@ -132,9 +136,11 @@ GEM json (~> 1.4) responders (2.1.0) railties (>= 4.2.0, < 5) - rest-client (1.6.7) - mime-types (>= 1.16) - sass (3.4.9) + rest-client (1.7.2) + ffi (~> 1.9) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + sass (3.4.11) sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -154,24 +160,24 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.2) + sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) sqlite3 (1.3.10) - term-ansicolor (1.2.2) - tins (~> 0.8) - thor (0.18.1) + term-ansicolor (1.3.0) + tins (~> 1.0) + thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - tins (0.13.2) + tins (1.3.4) turbolinks (2.5.3) coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) - tzinfo-data (1.2014.10) + tzinfo-data (1.2015.1) tzinfo (>= 1.0.0) - uglifier (2.6.1) + uglifier (2.7.0) execjs (>= 0.3.0) json (>= 1.8.0) warden (1.2.3) @@ -190,7 +196,7 @@ PLATFORMS DEPENDENCIES autoprefixer-rails - bh (~> 1.2) + bh (~> 1.3.1) bootstrap-sass (~> 3.3.1) codemirror-rails coffee-rails (~> 4.1.0) @@ -206,7 +212,7 @@ DEPENDENCIES sqlite3 turbolinks tzinfo-data - uglifier (>= 1.3.0) + uglifier (~> 2.7.0) web-console (~> 2.0) will_paginate (~> 3.0.6) will_paginate-bootstrap