aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorrhenium <re4k@re4k.info>2013-06-08 12:15:32 +0900
committerrhenium <re4k@re4k.info>2013-06-08 12:15:32 +0900
commit01b3f5d280a06a7261720cdc464f45fd7684f778 (patch)
tree21cdb498ea2b4c933f150c3a210c03cc89a974e9 /Gemfile.lock
parentedbb08497da9870e06584d0fe5efd484c0ed3bdd (diff)
downloadaclog-01b3f5d280a06a7261720cdc464f45fd7684f778.tar.gz
bundle update
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock14
1 files changed, 8 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3cb24fc..e2ab2b7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -46,7 +46,8 @@ GEM
iobuffer (>= 1.0.0)
counter_culture (0.1.12)
after_commit_action (~> 0.1.3)
- crack (0.3.2)
+ crack (0.4.0)
+ safe_yaml (~> 0.9.0)
daemon-spawn (0.4.2)
daemons (1.1.9)
dalli (2.6.4)
@@ -72,13 +73,13 @@ GEM
haml (>= 3.1, < 4.1)
railties (>= 3.1, < 4.1)
hashie (2.0.5)
- hike (1.2.2)
+ hike (1.2.3)
i18n (0.6.4)
iobuffer (1.1.2)
- jbuilder (1.4.1)
+ jbuilder (1.4.2)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
- jquery-rails (3.0.0)
+ jquery-rails (3.0.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
kgio (2.8.0)
@@ -92,7 +93,7 @@ GEM
msgpack-rpc (0.5.1)
cool.io (~> 1.1.0)
msgpack (~> 0.4.4)
- multi_json (1.7.4)
+ multi_json (1.7.6)
multipart-post (1.2.0)
mysql2 (0.3.12b6)
oauth (0.4.7)
@@ -145,6 +146,7 @@ GEM
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
+ safe_yaml (0.9.3)
sass (3.2.9)
sass-rails (4.0.0.rc1)
railties (>= 4.0.0.beta, < 5.0)
@@ -171,7 +173,7 @@ GEM
thread_safe (0.1.0)
atomic
tilt (1.4.1)
- treetop (1.4.12)
+ treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
twitter (4.7.0)