aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRhenium <rhenium@rhe.jp>2013-09-11 12:52:32 +0900
committerRhenium <rhenium@rhe.jp>2013-09-11 12:52:32 +0900
commit827e4a47df434700c6354fb2276305696424c798 (patch)
treed88c535c079c6996c195592d0e461e5948bd07d9 /Gemfile.lock
parentab9182690e906535cb1011dfccc207c6279c4410 (diff)
downloadaclog-827e4a47df434700c6354fb2276305696424c798.tar.gz
bundle update
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock21
1 files changed, 10 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index dfe7d11..0a4b6c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,8 +27,8 @@ GEM
tzinfo (~> 0.3.37)
addressable (2.3.5)
arel (4.0.0)
- atomic (1.1.13)
- bootstrap-sass-rails (3.0.0.1)
+ atomic (1.1.14)
+ bootstrap-sass-rails (3.0.0.2)
railties (>= 3.1.0)
sass-rails (>= 3.1.0)
builder (3.1.4)
@@ -59,8 +59,7 @@ GEM
eventmachine
erubis (2.7.0)
eventmachine (1.0.3)
- execjs (1.4.0)
- multi_json (~> 1.0)
+ execjs (2.0.1)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.2.1)
@@ -79,24 +78,24 @@ GEM
hike (1.2.3)
i18n (0.6.5)
iobuffer (1.1.2)
- jbuilder (1.5.0)
+ jbuilder (1.5.1)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- kgio (2.8.0)
+ kgio (2.8.1)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.2)
- mime-types (1.24)
+ mime-types (1.25)
minitest (4.7.5)
msgpack (0.4.7)
msgpack-rpc (0.5.1)
cool.io (~> 1.1.0)
msgpack (~> 0.4.4)
- multi_json (1.7.9)
+ multi_json (1.8.0)
multipart-post (1.2.0)
mysql2 (0.3.13)
oauth (0.4.7)
@@ -132,7 +131,7 @@ GEM
activesupport (= 4.0.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- raindrops (0.11.0)
+ raindrops (0.12.0)
rake (10.1.0)
rest-client (1.6.7)
mime-types (>= 1.16)
@@ -178,7 +177,7 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.18.1)
- thread_safe (0.1.2)
+ thread_safe (0.1.3)
atomic
tilt (1.4.1)
treetop (1.4.15)
@@ -189,7 +188,7 @@ GEM
multi_json (~> 1.0)
simple_oauth (~> 0.2)
tzinfo (0.3.37)
- uglifier (2.1.2)
+ uglifier (2.2.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
unicorn (4.6.3)