summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Legler <alex@a3li.li>2016-06-01 19:46:15 +0200
committerAlex Legler <alex@a3li.li>2016-06-01 19:46:15 +0200
commit905ce7359868d4f7c894d0d9fa162e0881e5dc93 (patch)
treea11c07670c0bb59c36b2e0ae18a828e0d9f9605a
parentBe less strict on the old methods (diff)
downloadglsamaker-905ce7359868d4f7c894d0d9fa162e0881e5dc93.tar.gz
glsamaker-905ce7359868d4f7c894d0d9fa162e0881e5dc93.tar.bz2
glsamaker-905ce7359868d4f7c894d0d9fa162e0881e5dc93.zip
Add jbuilder
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock5
2 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index d527cf3..25bbcf2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,7 @@ gem 'rails', '4.2.0'
gem 'mysql2', '~> 0.3.18'
gem 'json', '~>1.8.2'
+gem 'jbuilder', '~> 2.0'
# Gems used only for assets and not required
# in production environments by default.
diff --git a/Gemfile.lock b/Gemfile.lock
index 03c3d96..4278afe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,6 +68,9 @@ GEM
domain_name (~> 0.5)
i18n (0.7.0)
innertube (1.1.0)
+ jbuilder (2.5.0)
+ activesupport (>= 3.0.0, < 5.1)
+ multi_json (~> 1.2)
joiner (0.3.4)
activerecord (>= 4.1.0)
json (1.8.3)
@@ -94,6 +97,7 @@ GEM
builder
minitest (>= 5.0)
ruby-progressbar
+ multi_json (1.12.1)
mysql2 (0.3.20)
net-http-digest_auth (1.4)
net-http-persistent (2.9.4)
@@ -193,6 +197,7 @@ DEPENDENCIES
ci_reporter
diff-lcs
fastercsv
+ jbuilder (~> 2.0)
json (~> 1.8.2)
kramdown
mechanize