Download as
Browse Code »

Commit b0b158d83d83437f469a1c3b366de0eda659616b

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

jbuilder gem 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.1.2' 28 +gem 'jbuilder', '~> 2.2.2'
29 29
30 # For user authentication and everything else 30 # For user authentication and everything else
31 gem 'devise', '~> 3.4.0' 31 gem 'devise', '~> 3.4.0'
@@ -127,7 +127,7 @@ GEM @@ -127,7 +127,7 @@ GEM
127 google-analytics-rails (0.0.6) 127 google-analytics-rails (0.0.6)
128 hike (1.2.3) 128 hike (1.2.3)
129 i18n (0.6.11) 129 i18n (0.6.11)
130 - jbuilder (2.1.3) 130 + jbuilder (2.2.2)
131 activesupport (>= 3.0.0, < 5) 131 activesupport (>= 3.0.0, < 5)
132 multi_json (~> 1.2) 132 multi_json (~> 1.2)
133 jquery-rails (3.1.2) 133 jquery-rails (3.1.2)
@@ -292,7 +292,7 @@ DEPENDENCIES @@ -292,7 +292,7 @@ DEPENDENCIES
292 exception_notification (~> 4.0.1) 292 exception_notification (~> 4.0.1)
293 factory_girl_rails (~> 4.4.1) 293 factory_girl_rails (~> 4.4.1)
294 google-analytics-rails (~> 0.0.6) 294 google-analytics-rails (~> 0.0.6)
295 - jbuilder (~> 2.1.2) 295 + jbuilder (~> 2.2.2)
296 jquery-rails 296 jquery-rails
297 jquery-ui-rails (~> 5.0.0) 297 jquery-ui-rails (~> 5.0.0)
298 kalibro_gatekeeper_client (~> 1.0.0) 298 kalibro_gatekeeper_client (~> 1.0.0)