aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorrhenium <rhenium@rhe.jp>2014-10-06 08:53:41 +0900
committerrhenium <rhenium@rhe.jp>2014-10-06 08:53:41 +0900
commit82168725bcd66587a9d74cf3da44c71cc21c627c (patch)
tree777e36c453c712d5b62d690ed0a03b667eabd58f /Gemfile.lock
parent5d32ae79c63074de3ab11296e4ebbe7d42f37d3b (diff)
downloadaclog-82168725bcd66587a9d74cf3da44c71cc21c627c.tar.gz
bundle update (Rails 4.2.0.beta2)
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock108
1 files changed, 57 insertions, 51 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index fde8f31..4225722 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,36 +1,38 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.2.0.beta1)
- actionpack (= 4.2.0.beta1)
- actionview (= 4.2.0.beta1)
+ actionmailer (4.2.0.beta2)
+ actionpack (= 4.2.0.beta2)
+ actionview (= 4.2.0.beta2)
+ activejob (= 4.2.0.beta2)
mail (~> 2.5, >= 2.5.4)
- rails-dom-testing (~> 1.0, >= 1.0.2)
- actionpack (4.2.0.beta1)
- actionview (= 4.2.0.beta1)
- activesupport (= 4.2.0.beta1)
+ rails-dom-testing (~> 1.0, >= 1.0.3)
+ actionpack (4.2.0.beta2)
+ actionview (= 4.2.0.beta2)
+ activesupport (= 4.2.0.beta2)
rack (~> 1.6.0.beta)
rack-test (~> 0.6.2)
- rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
- rails-dom-testing (~> 1.0, >= 1.0.2)
- actionview (4.2.0.beta1)
- activesupport (= 4.2.0.beta1)
+ rails-dom-testing (~> 1.0, >= 1.0.3)
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
+ actionview (4.2.0.beta2)
+ activesupport (= 4.2.0.beta2)
builder (~> 3.1)
erubis (~> 2.7.0)
- rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
- rails-dom-testing (~> 1.0, >= 1.0.2)
- activejob (4.2.0.beta1)
- globalid (>= 0.2.3)
- activemodel (4.2.0.beta1)
- activesupport (= 4.2.0.beta1)
+ rails-dom-testing (~> 1.0, >= 1.0.3)
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
+ activejob (4.2.0.beta2)
+ activesupport (= 4.2.0.beta2)
+ globalid (>= 0.3.0)
+ activemodel (4.2.0.beta2)
+ activesupport (= 4.2.0.beta2)
builder (~> 3.1)
- activerecord (4.2.0.beta1)
- activemodel (= 4.2.0.beta1)
- activesupport (= 4.2.0.beta1)
+ activerecord (4.2.0.beta2)
+ activemodel (= 4.2.0.beta2)
+ activesupport (= 4.2.0.beta2)
arel (>= 6.0.0.beta1, < 6.1)
activerecord-import (0.5.0)
activerecord (>= 3.0)
- activesupport (4.2.0.beta1)
+ activesupport (4.2.0.beta2)
i18n (>= 0.7.0.beta1, < 0.8)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@@ -48,7 +50,7 @@ GEM
sass (~> 3.2)
buftok (0.2.0)
builder (3.2.2)
- byebug (3.4.0)
+ byebug (3.5.1)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
slop (~> 3.6)
@@ -93,7 +95,7 @@ GEM
railties (>= 3.0.0)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
- ffi (1.9.3)
+ ffi (1.9.5)
formatador (0.2.5)
globalid (0.3.0)
activesupport (>= 4.1.0)
@@ -142,10 +144,12 @@ GEM
thor (>= 0.14, < 2.0)
json (1.8.1)
kgio (2.9.2)
- listen (2.7.9)
+ listen (2.7.11)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
+ loofah (2.0.1)
+ nokogiri (>= 1.5.9)
lumberjack (1.0.9)
mail (2.6.1)
mime-types (>= 1.16, < 3)
@@ -154,7 +158,7 @@ GEM
method_source (0.8.2)
mime-types (2.3)
mini_portile (0.6.0)
- minitest (5.4.1)
+ minitest (5.4.2)
msgpack (0.5.8)
msgpack-rpc (0.5.2)
cool.io (~> 1.1.1)
@@ -194,26 +198,28 @@ GEM
rack (>= 1.0.0)
rack-test (0.6.2)
rack (>= 1.0)
- rails (4.2.0.beta1)
- actionmailer (= 4.2.0.beta1)
- actionpack (= 4.2.0.beta1)
- actionview (= 4.2.0.beta1)
- activejob (= 4.2.0.beta1)
- activemodel (= 4.2.0.beta1)
- activerecord (= 4.2.0.beta1)
- activesupport (= 4.2.0.beta1)
+ rails (4.2.0.beta2)
+ actionmailer (= 4.2.0.beta2)
+ actionpack (= 4.2.0.beta2)
+ actionview (= 4.2.0.beta2)
+ activejob (= 4.2.0.beta2)
+ activemodel (= 4.2.0.beta2)
+ activerecord (= 4.2.0.beta2)
+ activesupport (= 4.2.0.beta2)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.0.beta1)
+ railties (= 4.2.0.beta2)
sprockets-rails (~> 3.0.0.beta1)
- rails-deprecated_sanitizer (1.0.2)
+ rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
- rails-dom-testing (1.0.2)
+ rails-dom-testing (1.0.3)
activesupport
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
- railties (4.2.0.beta1)
- actionpack (= 4.2.0.beta1)
- activesupport (= 4.2.0.beta1)
+ rails-html-sanitizer (1.0.1)
+ loofah (~> 2.0)
+ railties (4.2.0.beta2)
+ actionpack (= 4.2.0.beta2)
+ activesupport (= 4.2.0.beta2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
@@ -228,12 +234,12 @@ GEM
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
- rspec-core (3.1.4)
+ rspec-core (3.1.5)
rspec-support (~> 3.1.0)
- rspec-expectations (3.1.1)
+ rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
- rspec-mocks (3.1.1)
+ rspec-mocks (3.1.2)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
@@ -243,9 +249,9 @@ GEM
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
- rspec-support (3.1.0)
- safe_yaml (1.0.3)
- sass (3.4.4)
+ rspec-support (3.1.1)
+ safe_yaml (1.0.4)
+ sass (3.4.5)
sass-rails (5.0.0.beta1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2)
@@ -253,9 +259,9 @@ GEM
sprockets-rails (>= 2.0, < 4.0)
settingslogic (2.0.9)
simple_oauth (0.2.0)
- simplecov (0.9.0)
+ simplecov (0.9.1)
docile (~> 1.1.0)
- multi_json
+ multi_json (~> 1.0)
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slop (3.6.0)
@@ -279,7 +285,7 @@ GEM
timers (4.0.1)
hitimes
tins (1.3.3)
- turbolinks (2.3.0)
+ turbolinks (2.4.0)
coffee-rails
twitter (5.11.0)
addressable (~> 2.3)
@@ -296,7 +302,7 @@ GEM
unf (~> 0.1.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
- tzinfo-data (1.2014.7)
+ tzinfo-data (1.2014.8)
tzinfo (>= 1.0.0)
uglifier (2.5.3)
execjs (>= 0.3.0)
@@ -315,12 +321,12 @@ GEM
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
- web-console (2.0.0.beta3)
+ web-console (2.0.0.beta4)
activemodel (~> 4.0)
binding_of_caller (= 0.7.3.pre1)
railties (~> 4.0)
sprockets-rails (>= 2.0, < 4.0)
- webmock (1.18.0)
+ webmock (1.19.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
yajl-ruby (1.2.1)