diff --git a/Gemfile b/Gemfile index 2beb885..d805471 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,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', '~> 1.0.0', group: :doc diff --git a/Gemfile.lock b/Gemfile.lock index e1a4770..4e12085 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -135,9 +135,8 @@ GEM htmlentities (4.3.4) i18n (0.9.5) concurrent-ruby (~> 1.0) - jbuilder (2.6.0) - activesupport (>= 3.0.0, < 5.1) - multi_json (~> 1.2) + jbuilder (2.9.1) + activesupport (>= 4.2.0) jquery-rails (4.2.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -408,7 +407,7 @@ PLATFORMS DEPENDENCIES byebug coffee-rails (~> 4.1.0) - jbuilder (~> 2.0) + jbuilder (~> 2.9) jquery-rails rails (= 4.2.11.1) refinerycms (~> 3.0.6)