aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRhenium <rhenium@rhe.jp>2013-12-20 22:05:49 +0900
committerRhenium <rhenium@rhe.jp>2013-12-20 22:05:49 +0900
commit32c7d9a145076560ad8e79cefaf5277ee3e18c34 (patch)
treeef2a8e695e8d93df3308174008c3df2844c85ce3 /Gemfile.lock
parent6487eb3a14e0350ee09537fb3ee36d6392a0e96c (diff)
downloadaclog-32c7d9a145076560ad8e79cefaf5277ee3e18c34.tar.gz
bundle update
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock34
1 files changed, 17 insertions, 17 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 546c83a..ac086b6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,7 +30,7 @@ GEM
addressable (2.3.5)
arel (4.0.1)
atomic (1.1.14)
- bootstrap-sass-rails (3.0.2.1)
+ bootstrap-sass-rails (3.0.3.0)
railties (>= 3.1.0)
sass-rails (>= 3.1.0)
buftok (0.2.0)
@@ -61,7 +61,7 @@ GEM
docile (1.1.1)
em-work_queue (0.0.1)
eventmachine
- equalizer (0.0.8)
+ equalizer (0.0.7)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.2)
@@ -74,16 +74,16 @@ GEM
multipart-post (~> 1.2.0)
haml (4.0.4)
tilt
- haml-rails (0.5.1)
- actionpack (~> 4.0.0)
- activesupport (~> 4.0.0)
+ haml-rails (0.5.3)
+ actionpack (>= 4.0.1)
+ activesupport (>= 4.0.1)
haml (>= 3.1, < 5.0)
- railties (~> 4.0.0)
+ railties (>= 4.0.1)
hashie (2.0.5)
hike (1.2.3)
http (0.5.0)
http_parser.rb
- http_parser.rb (0.5.3)
+ http_parser.rb (0.6.0)
i18n (0.6.9)
iobuffer (1.1.2)
jbuilder (1.5.3)
@@ -97,7 +97,7 @@ GEM
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- memoizable (0.2.0)
+ memoizable (0.3.1)
thread_safe (~> 0.1.3)
method_source (0.8.2)
mime-types (1.25.1)
@@ -143,7 +143,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.12.0)
- rake (10.1.0)
+ rake (10.1.1)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.14.1)
@@ -162,7 +162,7 @@ GEM
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
safe_yaml (0.9.7)
- sass (3.2.12)
+ sass (3.2.13)
sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
@@ -198,19 +198,19 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- twitter (5.1.1)
+ twitter (5.3.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
descendants_tracker (~> 0.0.1)
- equalizer (~> 0.0.7)
+ equalizer (~> 0.0.7, != 0.0.8)
faraday (>= 0.8, < 0.10)
http (~> 0.5.0)
- http_parser.rb (~> 0.5.0)
+ http_parser.rb (~> 0.6.0)
json (~> 1.8)
- memoizable (~> 0.2.0)
+ memoizable (~> 0.3.1)
simple_oauth (~> 0.2.0)
tzinfo (0.3.38)
- uglifier (2.3.2)
+ uglifier (2.4.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.7.0)
@@ -219,10 +219,10 @@ GEM
raindrops (~> 0.7)
unicorn-worker-killer (0.4.2)
unicorn (~> 4)
- webmock (1.16.0)
+ webmock (1.16.1)
addressable (>= 2.2.7)
crack (>= 0.3.2)
- yajl-ruby (1.1.0)
+ yajl-ruby (1.2.0)
PLATFORMS
ruby