diff --git a/Gemfile b/Gemfile index 260c37f..edcb7ec 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem 'jquery-rails' gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.2.2' +gem 'jbuilder', '~> 2.0' # For user authentication and everything else gem 'devise', '~> 3.5.1' diff --git a/Gemfile.lock b/Gemfile.lock index f2a1391..246f744 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,7 +146,7 @@ GEM i18n_generators (1.2.1) mechanize rails (>= 3.0.0) - jbuilder (2.2.13) + jbuilder (2.3.0) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) jquery-rails (4.0.3) @@ -345,7 +345,7 @@ DEPENDENCIES google-analytics-rails (~> 0.0.6) http_accept_language i18n_generators - jbuilder (~> 2.2.2) + jbuilder (~> 2.0) jquery-rails jquery-ui-rails (~> 5.0.0) kalibro_client (~> 0.3.0) -- libgit2 0.21.2