summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-04-26 20:09:23 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-04-26 20:09:23 -0400
commitac499ddadbae8823b4eee58187bc0f1ef9a0dc45 (patch)
tree0e0d0270e0bde9a59f4682a7ddff36560f0eed2d /Gemfile.lock
parent67d95e5b92e3d19765c7ccaf5460737ffe2173f4 (diff)
pull changes from master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 145a7fc..2de3fea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,6 +50,9 @@ GEM
delayed_job (>= 3.0, < 4.1)
erubis (2.7.0)
execjs (2.0.2)
+ figaro (0.7.0)
+ bundler (~> 1.0)
+ rails (>= 3, < 5)
foreigner (1.6.1)
activerecord (>= 3.0.0)
hike (1.2.3)
@@ -143,6 +146,7 @@ DEPENDENCIES
coffee-rails (~> 4.0.0)
daemons
delayed_job_active_record
+ figaro
httparty
jbuilder (~> 1.2)
jquery-rails