aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-01-05 22:06:12 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-01-05 22:06:12 +0900
commit5678e96f1d7208bea71cbb723dda9b5dc27334ef (patch)
treee97e05b2250d9757d592da0f92efaa2bb0fe00c2 /Gemfile.lock
parent29b1b57c08dd843d4b2be56b73ad636e28c210c4 (diff)
downloadaclog-5678e96f1d7208bea71cbb723dda9b5dc27334ef.tar.gz
bundle update
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock26
1 files changed, 13 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 86542c6..e3353c1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,7 +38,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- addressable (2.3.8)
+ addressable (2.4.0)
arel (6.0.3)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
@@ -53,7 +53,7 @@ GEM
connection_pool (2.2.0)
cool.io (1.2.4)
daemons (1.2.3)
- dalli (2.7.4)
+ dalli (2.7.5)
delayed_job (4.1.1)
activesupport (>= 3.0, < 5.0)
delayed_job_active_record (4.1.0)
@@ -70,7 +70,7 @@ GEM
multipart-post (>= 1.2, < 3)
globalid (0.3.6)
activesupport (>= 4.1.0)
- grape (0.13.0)
+ grape (0.14.0)
activesupport
builder
hashie (>= 2.1.0)
@@ -117,10 +117,10 @@ GEM
multipart-post (2.0.0)
mysql2 (0.3.20)
naught (1.1.0)
- nokogiri (1.6.7)
+ nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
oauth (0.4.7)
- oj (2.12.14)
+ oj (2.14.3)
oj_mimic_json (1.0.1)
pry (0.10.3)
coderay (~> 1.1.0)
@@ -129,7 +129,7 @@ GEM
pry-rails (0.3.4)
pry (>= 0.9.10)
puma (2.15.3)
- rabl (0.11.6)
+ rabl (0.11.7)
activesupport (>= 2.3.14)
rack (1.6.4)
rack-accept (0.4.5)
@@ -166,16 +166,16 @@ GEM
settingslogic (2.0.9)
simple_oauth (0.3.1)
slop (3.6.0)
- sprockets (3.5.0)
+ sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-rails (2.3.3)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- sprockets (>= 2.8, < 4.0)
+ sprockets-rails (3.0.0)
+ actionpack (>= 4.0)
+ activesupport (>= 4.0)
+ sprockets (>= 3.0.0)
thor (0.19.1)
thread_safe (0.3.5)
- tilt (2.0.1)
+ tilt (2.0.2)
twitter (5.15.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
@@ -226,4 +226,4 @@ DEPENDENCIES
tzinfo-data
BUNDLED WITH
- 1.10.6
+ 1.11.2