Download as
Browse Code »

Commit 4c819f53861bc7e48ae9ce6daea8d792d858a48a

Authored by Rafael Manzo
Committed by Diego Camarinha
1 parent 973daa63
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

jbuilder updated

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
@@ -25,7 +25,7 @@ gem 'jquery-rails' @@ -25,7 +25,7 @@ gem 'jquery-rails'
25 gem 'turbolinks' 25 gem 'turbolinks'
26 26
27 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder 27 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
28 -gem 'jbuilder', '~> 2.2.2' 28 +gem 'jbuilder', '~> 2.0'
29 29
30 # For user authentication and everything else 30 # For user authentication and everything else
31 gem 'devise', '~> 3.5.1' 31 gem 'devise', '~> 3.5.1'
@@ -146,7 +146,7 @@ GEM @@ -146,7 +146,7 @@ GEM
146 i18n_generators (1.2.1) 146 i18n_generators (1.2.1)
147 mechanize 147 mechanize
148 rails (>= 3.0.0) 148 rails (>= 3.0.0)
149 - jbuilder (2.2.13) 149 + jbuilder (2.3.0)
150 activesupport (>= 3.0.0, < 5) 150 activesupport (>= 3.0.0, < 5)
151 multi_json (~> 1.2) 151 multi_json (~> 1.2)
152 jquery-rails (4.0.3) 152 jquery-rails (4.0.3)
@@ -345,7 +345,7 @@ DEPENDENCIES @@ -345,7 +345,7 @@ DEPENDENCIES
345 google-analytics-rails (~> 0.0.6) 345 google-analytics-rails (~> 0.0.6)
346 http_accept_language 346 http_accept_language
347 i18n_generators 347 i18n_generators
348 - jbuilder (~> 2.2.2) 348 + jbuilder (~> 2.0)
349 jquery-rails 349 jquery-rails
350 jquery-ui-rails (~> 5.0.0) 350 jquery-ui-rails (~> 5.0.0)
351 kalibro_client (~> 0.3.0) 351 kalibro_client (~> 0.3.0)