aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRhenium <rhenium@rhe.jp>2013-10-03 04:14:55 +0900
committerRhenium <rhenium@rhe.jp>2013-10-03 04:14:55 +0900
commite4206e67708eb96a43a21344a2c98df9746b1531 (patch)
tree9190783a3beb93537594e3bad404ec67ed07f9cf /Gemfile.lock
parent0d226834f23a94d2fa26a84c7a1829de463974fe (diff)
downloadaclog-e4206e67708eb96a43a21344a2c98df9746b1531.tar.gz
bundle update
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock26
1 files changed, 14 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 0a4b6c3..fe12e8c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,7 +28,7 @@ GEM
addressable (2.3.5)
arel (4.0.0)
atomic (1.1.14)
- bootstrap-sass-rails (3.0.0.2)
+ bootstrap-sass-rails (3.0.0.3)
railties (>= 3.1.0)
sass-rails (>= 3.1.0)
builder (3.1.4)
@@ -40,14 +40,13 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.6.3)
- colorize (0.5.8)
cool.io (1.1.1)
iobuffer (>= 1.0.0)
- coveralls (0.6.7)
- colorize
+ coveralls (0.7.0)
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
+ term-ansicolor
thor
crack (0.4.1)
safe_yaml (~> 0.9.0)
@@ -59,7 +58,7 @@ GEM
eventmachine
erubis (2.7.0)
eventmachine (1.0.3)
- execjs (2.0.1)
+ execjs (2.0.2)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.2.1)
@@ -140,7 +139,7 @@ GEM
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.5)
- rspec-expectations (2.14.2)
+ rspec-expectations (2.14.3)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.3)
rspec-rails (2.14.0)
@@ -150,8 +149,8 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
- safe_yaml (0.9.5)
- sass (3.2.10)
+ safe_yaml (0.9.7)
+ sass (3.2.11)
sass-rails (4.0.0)
railties (>= 4.0.0.beta, < 5.0)
sass (>= 3.1.10)
@@ -172,14 +171,17 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
- thin (1.5.1)
+ term-ansicolor (1.2.2)
+ tins (~> 0.8)
+ thin (1.6.0)
daemons (>= 1.0.9)
- eventmachine (>= 0.12.6)
- rack (>= 1.0.0)
+ eventmachine (>= 1.0.0)
+ rack (>= 1.5.0)
thor (0.18.1)
thread_safe (0.1.3)
atomic
tilt (1.4.1)
+ tins (0.11.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
@@ -195,7 +197,7 @@ GEM
kgio (~> 2.6)
rack
raindrops (~> 0.7)
- unicorn-worker-killer (0.4.1)
+ unicorn-worker-killer (0.4.2)
unicorn (~> 4)
webmock (1.13.0)
addressable (>= 2.2.7)