Download as
Browse Code »

Commit 1fe30b8d22173199fba9cf858ef641f9ed6f0615

Authored by Rafael Manzo
1 parent 29162c7a
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
@@ -28,7 +28,7 @@ gem 'jquery-rails' @@ -28,7 +28,7 @@ gem 'jquery-rails'
28 gem 'turbolinks' 28 gem 'turbolinks'
29 29
30 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder 30 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
31 -gem 'jbuilder', '~> 1.2' 31 +gem 'jbuilder', '~> 2.0.2'
32 32
33 # For user authentication and everything else 33 # For user authentication and everything else
34 gem 'devise', '~> 3.2.0' 34 gem 'devise', '~> 3.2.0'
@@ -111,7 +111,7 @@ GEM @@ -111,7 +111,7 @@ GEM
111 rack 111 rack
112 rubyntlm (~> 0.3.2) 112 rubyntlm (~> 0.3.2)
113 i18n (0.6.9) 113 i18n (0.6.9)
114 - jbuilder (1.5.3) 114 + jbuilder (2.0.2)
115 activesupport (>= 3.0.0) 115 activesupport (>= 3.0.0)
116 multi_json (>= 1.2.0) 116 multi_json (>= 1.2.0)
117 jquery-rails (3.0.4) 117 jquery-rails (3.0.4)
@@ -280,7 +280,7 @@ DEPENDENCIES @@ -280,7 +280,7 @@ DEPENDENCIES
280 devise (~> 3.2.0) 280 devise (~> 3.2.0)
281 factory_girl_rails (~> 4.3.0) 281 factory_girl_rails (~> 4.3.0)
282 gruff (~> 0.5.1) 282 gruff (~> 0.5.1)
283 - jbuilder (~> 1.2) 283 + jbuilder (~> 2.0.2)
284 jquery-rails 284 jquery-rails
285 jquery-ui-rails (~> 4.1.0) 285 jquery-ui-rails (~> 4.1.0)
286 kalibro_gem (~> 0.0.1.rc7) 286 kalibro_gem (~> 0.0.1.rc7)