aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrhenium <rhenium@rhe.jp>2014-12-04 07:11:10 +0900
committerrhenium <rhenium@rhe.jp>2014-12-04 07:11:10 +0900
commit2e60bdbd972a19c7fbc567266e891fed4719ee35 (patch)
tree131c49f1e0f95c8f01cf88693fc543e502485eea
parent544c7edffb21d235494f6c672fdb2262014eca16 (diff)
downloadaclog-2e60bdbd972a19c7fbc567266e891fed4719ee35.tar.gz
bundle update (upgrade rails to 4.2.0.rc1)
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock179
-rw-r--r--worker_node/Gemfile.lock8
3 files changed, 95 insertions, 94 deletions
diff --git a/Gemfile b/Gemfile
index d568ab9..9e7a011 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
-gem "rails", "~> 4.2.0.beta1"
+gem "rails", "~> 4.2.0.rc1"
gem "activerecord-import"
gem "tzinfo-data"
gem "mysql2"
diff --git a/Gemfile.lock b/Gemfile.lock
index 4225722..be2c9b4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,52 +1,52 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.2.0.beta2)
- actionpack (= 4.2.0.beta2)
- actionview (= 4.2.0.beta2)
- activejob (= 4.2.0.beta2)
+ actionmailer (4.2.0.rc1)
+ actionpack (= 4.2.0.rc1)
+ actionview (= 4.2.0.rc1)
+ activejob (= 4.2.0.rc1)
mail (~> 2.5, >= 2.5.4)
- 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)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ actionpack (4.2.0.rc1)
+ actionview (= 4.2.0.rc1)
+ activesupport (= 4.2.0.rc1)
+ rack (~> 1.6.0.beta2)
rack-test (~> 0.6.2)
- rails-dom-testing (~> 1.0, >= 1.0.3)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
- actionview (4.2.0.beta2)
- activesupport (= 4.2.0.beta2)
+ actionview (4.2.0.rc1)
+ activesupport (= 4.2.0.rc1)
builder (~> 3.1)
erubis (~> 2.7.0)
- rails-dom-testing (~> 1.0, >= 1.0.3)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
- activejob (4.2.0.beta2)
- activesupport (= 4.2.0.beta2)
+ activejob (4.2.0.rc1)
+ activesupport (= 4.2.0.rc1)
globalid (>= 0.3.0)
- activemodel (4.2.0.beta2)
- activesupport (= 4.2.0.beta2)
+ activemodel (4.2.0.rc1)
+ activesupport (= 4.2.0.rc1)
builder (~> 3.1)
- 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 (4.2.0.rc1)
+ activemodel (= 4.2.0.rc1)
+ activesupport (= 4.2.0.rc1)
+ arel (~> 6.0)
+ activerecord-import (0.6.0)
activerecord (>= 3.0)
- activesupport (4.2.0.beta2)
+ activesupport (4.2.0.rc1)
i18n (>= 0.7.0.beta1, < 0.8)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
addressable (2.3.6)
- arel (6.0.0.beta1)
+ arel (6.0.0)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
- binding_of_caller (0.7.3.pre1)
+ binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- bootstrap-sass (3.2.0.2)
+ bootstrap-sass (3.3.1.0)
sass (~> 3.2)
buftok (0.2.0)
builder (3.2.2)
@@ -59,7 +59,7 @@ GEM
coderay (1.1.0)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
- coffee-rails (4.0.1)
+ coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0)
@@ -87,15 +87,15 @@ GEM
equalizer (0.0.9)
erubis (2.7.0)
eventmachine (1.0.3)
- execjs (2.2.1)
- factory_girl (4.4.0)
+ execjs (2.2.2)
+ factory_girl (4.5.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.4.1)
- factory_girl (~> 4.4.0)
+ factory_girl_rails (4.5.0)
+ factory_girl (~> 4.5.0)
railties (>= 3.0.0)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
- ffi (1.9.5)
+ ffi (1.9.6)
formatador (0.2.5)
globalid (0.3.0)
activesupport (>= 4.1.0)
@@ -114,7 +114,7 @@ GEM
i18n
rabl
tilt
- guard (2.6.1)
+ guard (2.10.1)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
@@ -123,54 +123,55 @@ GEM
guard-rspec (4.3.1)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
- haml (4.0.5)
+ haml (4.0.6)
tilt
haml-rails (0.5.3)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 3.1, < 5.0)
railties (>= 4.0.1)
- hashie (3.3.1)
+ hashie (3.3.2)
hike (1.2.3)
hitimes (1.2.2)
- http (0.6.2)
+ http (0.6.3)
http_parser.rb (~> 0.6.0)
http_parser.rb (0.6.0)
i18n (0.7.0.beta1)
- ice_nine (0.11.0)
+ ice_nine (0.11.1)
iobuffer (1.1.2)
- jquery-rails (3.1.2)
- railties (>= 3.0, < 5.0)
+ jquery-rails (4.0.0)
+ rails-dom-testing (~> 1.0)
+ railties (>= 4.2.0.beta, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
kgio (2.9.2)
- listen (2.7.11)
+ listen (2.8.3)
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)
+ mail (2.6.3)
mime-types (>= 1.16, < 3)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
- mime-types (2.3)
- mini_portile (0.6.0)
- minitest (5.4.2)
- msgpack (0.5.8)
+ mime-types (2.4.3)
+ mini_portile (0.6.1)
+ minitest (5.4.3)
+ msgpack (0.5.9)
msgpack-rpc (0.5.2)
cool.io (~> 1.1.1)
msgpack (~> 0.5.8)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
- mysql2 (0.3.16)
+ mysql2 (0.3.17)
naught (1.0.0)
- netrc (0.7.7)
- nokogiri (1.6.3.1)
- mini_portile (= 0.6.0)
+ netrc (0.9.0)
+ nokogiri (1.6.5)
+ mini_portile (~> 0.6.0)
oauth (0.4.7)
omniauth (1.2.2)
hashie (>= 1.2, < 4)
@@ -178,7 +179,7 @@ GEM
omniauth-oauth (1.0.1)
oauth
omniauth (~> 1.0)
- omniauth-twitter (1.0.1)
+ omniauth-twitter (1.1.0)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
pry (0.10.1)
@@ -189,41 +190,41 @@ GEM
pry (>= 0.9.10)
quiet_assets (1.0.3)
railties (>= 3.1, < 5.0)
- rabl (0.11.0)
+ rabl (0.11.4)
activesupport (>= 2.3.14)
- rack (1.6.0.beta)
+ rack (1.6.0.beta2)
rack-accept (0.4.5)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-test (0.6.2)
rack (>= 1.0)
- 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)
+ rails (4.2.0.rc1)
+ actionmailer (= 4.2.0.rc1)
+ actionpack (= 4.2.0.rc1)
+ actionview (= 4.2.0.rc1)
+ activejob (= 4.2.0.rc1)
+ activemodel (= 4.2.0.rc1)
+ activerecord (= 4.2.0.rc1)
+ activesupport (= 4.2.0.rc1)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.0.beta2)
- sprockets-rails (~> 3.0.0.beta1)
+ railties (= 4.2.0.rc1)
+ sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
- rails-dom-testing (1.0.3)
- activesupport
+ rails-dom-testing (1.0.5)
+ activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
loofah (~> 2.0)
- railties (4.2.0.beta2)
- actionpack (= 4.2.0.beta2)
- activesupport (= 4.2.0.beta2)
+ railties (4.2.0.rc1)
+ actionpack (= 4.2.0.rc1)
+ activesupport (= 4.2.0.rc1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
- rake (10.3.2)
+ rake (10.4.2)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
@@ -234,12 +235,12 @@ GEM
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
- rspec-core (3.1.5)
+ rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
- rspec-mocks (3.1.2)
+ rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
@@ -249,34 +250,34 @@ GEM
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
- rspec-support (3.1.1)
+ rspec-support (3.1.2)
safe_yaml (1.0.4)
- sass (3.4.5)
+ sass (3.4.9)
sass-rails (5.0.0.beta1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2)
sprockets (~> 2.12)
sprockets-rails (>= 2.0, < 4.0)
settingslogic (2.0.9)
- simple_oauth (0.2.0)
+ simple_oauth (0.3.0)
simplecov (0.9.1)
docile (~> 1.1.0)
multi_json (~> 1.0)
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slop (3.6.0)
- spring (1.1.3)
+ spring (1.2.0)
spring-commands-rspec (1.0.2)
spring (>= 0.9.1)
- sprockets (2.12.2)
+ sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sprockets-rails (3.0.0.beta1)
- actionpack (>= 4.0)
- activesupport (>= 4.0)
- sprockets (~> 2.8)
+ sprockets-rails (2.2.2)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ sprockets (>= 2.8, < 4.0)
term-ansicolor (1.3.0)
tins (~> 1.0)
thor (0.19.1)
@@ -285,9 +286,9 @@ GEM
timers (4.0.1)
hitimes
tins (1.3.3)
- turbolinks (2.4.0)
+ turbolinks (2.5.2)
coffee-rails
- twitter (5.11.0)
+ twitter (5.13.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
equalizer (~> 0.0.9)
@@ -297,12 +298,12 @@ GEM
json (~> 1.8)
memoizable (~> 0.4.0)
naught (~> 1.0)
- simple_oauth (~> 0.2.0)
- twitter-text (1.9.2)
+ simple_oauth (~> 0.3.0)
+ twitter-text (1.10.0)
unf (~> 0.1.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
- tzinfo-data (1.2014.8)
+ tzinfo-data (1.2014.10)
tzinfo (>= 1.0.0)
uglifier (2.5.3)
execjs (>= 0.3.0)
@@ -321,16 +322,16 @@ GEM
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
- web-console (2.0.0.beta4)
+ web-console (2.0.0)
activemodel (~> 4.0)
- binding_of_caller (= 0.7.3.pre1)
+ binding_of_caller (>= 0.7.2)
railties (~> 4.0)
sprockets-rails (>= 2.0, < 4.0)
- webmock (1.19.0)
+ webmock (1.20.4)
addressable (>= 2.3.6)
crack (>= 0.3.2)
yajl-ruby (1.2.1)
- yard (0.8.7.4)
+ yard (0.8.7.6)
PLATFORMS
ruby
@@ -354,7 +355,7 @@ DEPENDENCIES
omniauth-twitter
pry-rails
quiet_assets
- rails (~> 4.2.0.beta1)
+ rails (~> 4.2.0.rc1)
rspec
rspec-rails
sass-rails (~> 5.0.0.beta1)
diff --git a/worker_node/Gemfile.lock b/worker_node/Gemfile.lock
index b2d8fca..f011935 100644
--- a/worker_node/Gemfile.lock
+++ b/worker_node/Gemfile.lock
@@ -2,16 +2,16 @@ GEM
remote: https://rubygems.org/
specs:
buftok (0.2.0)
- em-twitter (0.3.3)
+ em-twitter (0.3.5)
buftok (~> 0.2)
eventmachine (~> 1.0)
http_parser.rb (~> 0.6)
simple_oauth (~> 0.2)
eventmachine (1.0.3)
http_parser.rb (0.6.0)
- msgpack (0.5.8)
- rake (10.3.2)
- simple_oauth (0.2.0)
+ msgpack (0.5.9)
+ rake (10.4.2)
+ simple_oauth (0.3.0)
yajl-ruby (1.2.1)
PLATFORMS