Download as
Browse Code »

Commit fa2ccebf2f3050263eb5b81f43015529a554fe36

Authored by Rafael Manzo
1 parent 184fd35d
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.0.4' 28 +gem 'jbuilder', '~> 2.1.2'
29 29
30 # For user authentication and everything else 30 # For user authentication and everything else
31 gem 'devise', '~> 3.2.4' 31 gem 'devise', '~> 3.2.4'
@@ -121,7 +121,7 @@ GEM @@ -121,7 +121,7 @@ GEM
121 multi_json (~> 1.3) 121 multi_json (~> 1.3)
122 hike (1.2.3) 122 hike (1.2.3)
123 i18n (0.6.11) 123 i18n (0.6.11)
124 - jbuilder (2.0.8) 124 + jbuilder (2.1.2)
125 activesupport (>= 3.0.0, < 5) 125 activesupport (>= 3.0.0, < 5)
126 multi_json (~> 1.2) 126 multi_json (~> 1.2)
127 jquery-rails (3.1.1) 127 jquery-rails (3.1.1)
@@ -279,7 +279,7 @@ DEPENDENCIES @@ -279,7 +279,7 @@ DEPENDENCIES
279 database_cleaner 279 database_cleaner
280 devise (~> 3.2.4) 280 devise (~> 3.2.4)
281 factory_girl_rails (~> 4.4.1) 281 factory_girl_rails (~> 4.4.1)
282 - jbuilder (~> 2.0.4) 282 + jbuilder (~> 2.1.2)
283 jquery-rails 283 jquery-rails
284 jquery-ui-rails (~> 4.2.1) 284 jquery-ui-rails (~> 4.2.1)
285 kalibro_gatekeeper_client (~> 0.1.0) 285 kalibro_gatekeeper_client (~> 0.1.0)