Merge pull request #101 from theodi/bump/bundler/jbuilder-2.6.4

Bump jbuilder to 2.6.4
forkbombapp · Jun 21, 2017 · 4c33bf4 · 4c33bf4
2 parents 3281d85 + c87ad4d
commit 4c33bf4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -27,7 +27,7 @@ gem 'jquery-rails'
 gem 'turbolinks'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.2'
+gem 'jbuilder', '~> 2.6'
 
 gem "github_api", '~> 0.17'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -146,10 +146,10 @@ GEM
     highline (1.7.8)
     hike (1.2.3)
     hitimes (1.2.2)
-    i18n (0.6.11)
-    jbuilder (1.5.3)
+    i18n (0.8.4)
+    jbuilder (2.6.4)
       activesupport (>= 3.0.0)
-      multi_json (>= 1.2.0)
+      multi_json (>= 1.2)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -306,7 +306,7 @@ GEM
       coffee-rails
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    tzinfo (0.3.42)
+    tzinfo (0.3.53)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     vcr (3.0.3)
@@ -342,7 +342,7 @@ DEPENDENCIES
   guard
   guard-cucumber
   guard-rspec
-  jbuilder (~> 1.2)
+  jbuilder (~> 2.6)
   jquery-rails
   kramdown
   omniauth