diff --git a/Gemfile b/Gemfile index f055139..d44f0d0 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem 'pg' gem 'sass-rails', '~> 4.0.0' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' +gem 'uglifier', '>= 2.3.0' # Use CoffeeScript for .js.coffee assets and views gem 'coffee-rails', '~> 4.0.0' @@ -29,7 +29,7 @@ gem 'jbuilder', '~> 1.2' group :doc do # bundle exec rake doc:rails generates the API under doc/api. - gem 'sdoc', require: false + gem 'sdoc', '>= 0.4.0', require: false end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 8ace359..e012c15 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,7 +45,7 @@ GEM coffee-script-source (1.6.3) debug_inspector (0.0.2) erubis (2.7.0) - execjs (2.0.2) + execjs (2.7.0) hike (1.2.3) i18n (0.6.5) jbuilder (1.5.2) @@ -54,7 +54,6 @@ GEM jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.1) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -80,16 +79,14 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.1.0) - rdoc (3.12.2) - json (~> 1.4) + rdoc (6.2.1) sass (3.2.12) sass-rails (4.0.1) railties (>= 4.0.0, < 5.0) sass (>= 3.1.10) sprockets-rails (~> 2.0.0) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) + sdoc (1.1.0) + rdoc (>= 5.0) sprockets (2.10.0) hike (~> 1.2) multi_json (~> 1.0) @@ -109,9 +106,8 @@ GEM turbolinks (1.3.0) coffee-rails tzinfo (0.3.38) - uglifier (2.3.0) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) PLATFORMS ruby @@ -126,6 +122,9 @@ DEPENDENCIES pg rails (= 4.0.0) sass-rails (~> 4.0.0) - sdoc + sdoc (>= 0.4.0) turbolinks - uglifier (>= 1.3.0) + uglifier (>= 2.3.0) + +BUNDLED WITH + 1.17.3