diff --git a/Gemfile b/Gemfile index 413699a..124bd91 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.0' +gem 'jbuilder', '~> 2.9' # bundle exec rake doc:rails generates the API under doc/api. gem 'sdoc', '~> 0.4.0', group: :doc diff --git a/Gemfile.lock b/Gemfile.lock index 3df1559..8941807 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,9 +130,8 @@ GEM activerecord (>= 4.2.0, < 4.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jbuilder (2.3.1) - activesupport (>= 3.0.0, < 5) - multi_json (~> 1.2) + jbuilder (2.9.1) + activesupport (>= 4.2.0) jquery-rails (4.0.5) rails-dom-testing (~> 1.0) railties (>= 4.2.0) @@ -147,8 +146,8 @@ GEM mime-types (>= 1.16, < 3) mime-types (2.6.1) mini_portile2 (2.4.0) - minitest (5.11.3) - multi_json (1.11.2) + minitest (5.13.0) + multi_json (1.14.1) nokogiri (1.10.5) mini_portile2 (~> 2.4.0) pg (0.18.3) @@ -237,7 +236,7 @@ PLATFORMS DEPENDENCIES byebug coffee-rails (~> 4.1.0) - jbuilder (~> 2.0) + jbuilder (~> 2.9) jquery-rails pg rails (= 4.2.4)