diff --git a/Gemfile b/Gemfile index 0a80e40..2c8c8e1 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.7' # bundle exec rake doc:rails generates the API under doc/api. -gem 'sdoc', '~> 0.4', group: :doc +gem 'sdoc', '~> 1.0', group: :doc # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' diff --git a/Gemfile.lock b/Gemfile.lock index 79f5ae1..da2c768 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -120,7 +120,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.6) + json (2.1.0) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.6) @@ -181,7 +181,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.0.0) - rdoc (4.3.0) + rdoc (6.0.1) responders (2.3.0) railties (>= 4.2.0, < 5.1) rspec-core (3.6.0) @@ -209,9 +209,8 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sdoc (0.4.2) - json (~> 1.7, >= 1.7.7) - rdoc (~> 4.0) + sdoc (1.0.0) + rdoc (>= 5.0) select2-rails (3.5.10) thor (~> 0.14) simplecov (0.15.0) @@ -281,7 +280,7 @@ DEPENDENCIES rails_12factor rspec-rails (~> 3.6) sass-rails (~> 5.0) - sdoc (~> 0.4) + sdoc (~> 1.0) select2-rails (~> 3.5) simplecov spreadsheet