Upgrade rails to 4.2.4
Akinori MUSHA
共有 2 个文件被更改，包括 40 次插入 和 40 次删除
+ 1
- 1
Gemfile
@@ -84,7 +84,7 @@ gem 'mysql2', '~> 0.3.16' |
||
| 84 | 84 |
gem 'multi_xml' |
| 85 | 85 |
gem 'nokogiri', '~> 1.6.4' |
| 86 | 86 |
gem 'omniauth' |
| 87 |
-gem 'rails' , '4.2.2' |
|
| 87 |
+gem 'rails', '4.2.4' |
|
| 88 | 88 |
gem 'rufus-scheduler', '~> 3.0.8', require: false |
| 89 | 89 |
gem 'sass-rails', '~> 5.0.3' |
| 90 | 90 |
gem 'select2-rails', '~> 3.5.4' |
+ 39
- 39
Gemfile.lock
@@ -54,43 +54,43 @@ GEM |
||
| 54 | 54 |
remote: https://rubygems.org/ |
| 55 | 55 |
specs: |
| 56 | 56 |
ace-rails-ap (2.0.1) |
| 57 |
- actionmailer (4.2.2) |
|
| 58 |
- actionpack (= 4.2.2) |
|
| 59 |
- actionview (= 4.2.2) |
|
| 60 |
- activejob (= 4.2.2) |
|
| 57 |
+ actionmailer (4.2.4) |
|
| 58 |
+ actionpack (= 4.2.4) |
|
| 59 |
+ actionview (= 4.2.4) |
|
| 60 |
+ activejob (= 4.2.4) |
|
| 61 | 61 |
mail (~> 2.5, >= 2.5.4) |
| 62 | 62 |
rails-dom-testing (~> 1.0, >= 1.0.5) |
| 63 |
- actionpack (4.2.2) |
|
| 64 |
- actionview (= 4.2.2) |
|
| 65 |
- activesupport (= 4.2.2) |
|
| 63 |
+ actionpack (4.2.4) |
|
| 64 |
+ actionview (= 4.2.4) |
|
| 65 |
+ activesupport (= 4.2.4) |
|
| 66 | 66 |
rack (~> 1.6) |
| 67 | 67 |
rack-test (~> 0.6.2) |
| 68 | 68 |
rails-dom-testing (~> 1.0, >= 1.0.5) |
| 69 |
- rails-html-sanitizer (~> 1.0, >= 1.0.1) |
|
| 70 |
- actionview (4.2.2) |
|
| 71 |
- activesupport (= 4.2.2) |
|
| 69 |
+ rails-html-sanitizer (~> 1.0, >= 1.0.2) |
|
| 70 |
+ actionview (4.2.4) |
|
| 71 |
+ activesupport (= 4.2.4) |
|
| 72 | 72 |
builder (~> 3.1) |
| 73 | 73 |
erubis (~> 2.7.0) |
| 74 | 74 |
rails-dom-testing (~> 1.0, >= 1.0.5) |
| 75 |
- rails-html-sanitizer (~> 1.0, >= 1.0.1) |
|
| 76 |
- activejob (4.2.2) |
|
| 77 |
- activesupport (= 4.2.2) |
|
| 75 |
+ rails-html-sanitizer (~> 1.0, >= 1.0.2) |
|
| 76 |
+ activejob (4.2.4) |
|
| 77 |
+ activesupport (= 4.2.4) |
|
| 78 | 78 |
globalid (>= 0.3.0) |
| 79 |
- activemodel (4.2.2) |
|
| 80 |
- activesupport (= 4.2.2) |
|
| 79 |
+ activemodel (4.2.4) |
|
| 80 |
+ activesupport (= 4.2.4) |
|
| 81 | 81 |
builder (~> 3.1) |
| 82 |
- activerecord (4.2.2) |
|
| 83 |
- activemodel (= 4.2.2) |
|
| 84 |
- activesupport (= 4.2.2) |
|
| 82 |
+ activerecord (4.2.4) |
|
| 83 |
+ activemodel (= 4.2.4) |
|
| 84 |
+ activesupport (= 4.2.4) |
|
| 85 | 85 |
arel (~> 6.0) |
| 86 |
- activesupport (4.2.2) |
|
| 86 |
+ activesupport (4.2.4) |
|
| 87 | 87 |
i18n (~> 0.7) |
| 88 | 88 |
json (~> 1.7, >= 1.7.7) |
| 89 | 89 |
minitest (~> 5.1) |
| 90 | 90 |
thread_safe (~> 0.3, >= 0.3.4) |
| 91 | 91 |
tzinfo (~> 1.1) |
| 92 | 92 |
addressable (2.3.8) |
| 93 |
- arel (6.0.0) |
|
| 93 |
+ arel (6.0.3) |
|
| 94 | 94 |
autoparse (0.3.3) |
| 95 | 95 |
addressable (>= 2.3.1) |
| 96 | 96 |
extlib (>= 0.9.15) |
@@ -204,7 +204,7 @@ GEM |
||
| 204 | 204 |
geokit-rails (2.0.1) |
| 205 | 205 |
geokit (~> 1.5) |
| 206 | 206 |
rails (>= 3.0) |
| 207 |
- globalid (0.3.5) |
|
| 207 |
+ globalid (0.3.6) |
|
| 208 | 208 |
activesupport (>= 4.1.0) |
| 209 | 209 |
google-api-client (0.7.1) |
| 210 | 210 |
addressable (>= 2.3.2) |
@@ -276,7 +276,7 @@ GEM |
||
| 276 | 276 |
celluloid (>= 0.15.2) |
| 277 | 277 |
rb-fsevent (>= 0.9.3) |
| 278 | 278 |
rb-inotify (>= 0.9) |
| 279 |
- loofah (2.0.2) |
|
| 279 |
+ loofah (2.0.3) |
|
| 280 | 280 |
nokogiri (>= 1.5.9) |
| 281 | 281 |
lumberjack (1.0.9) |
| 282 | 282 |
macaddr (1.7.1) |
@@ -289,7 +289,7 @@ GEM |
||
| 289 | 289 |
mime-types (2.6.1) |
| 290 | 290 |
mini_magick (4.2.3) |
| 291 | 291 |
mini_portile (0.6.2) |
| 292 |
- minitest (5.7.0) |
|
| 292 |
+ minitest (5.8.0) |
|
| 293 | 293 |
mqtt (0.3.1) |
| 294 | 294 |
multi_json (1.11.2) |
| 295 | 295 |
multi_xml (0.5.5) |
@@ -347,20 +347,20 @@ GEM |
||
| 347 | 347 |
rack (1.6.4) |
| 348 | 348 |
rack-test (0.6.3) |
| 349 | 349 |
rack (>= 1.0) |
| 350 |
- rails (4.2.2) |
|
| 351 |
- actionmailer (= 4.2.2) |
|
| 352 |
- actionpack (= 4.2.2) |
|
| 353 |
- actionview (= 4.2.2) |
|
| 354 |
- activejob (= 4.2.2) |
|
| 355 |
- activemodel (= 4.2.2) |
|
| 356 |
- activerecord (= 4.2.2) |
|
| 357 |
- activesupport (= 4.2.2) |
|
| 350 |
+ rails (4.2.4) |
|
| 351 |
+ actionmailer (= 4.2.4) |
|
| 352 |
+ actionpack (= 4.2.4) |
|
| 353 |
+ actionview (= 4.2.4) |
|
| 354 |
+ activejob (= 4.2.4) |
|
| 355 |
+ activemodel (= 4.2.4) |
|
| 356 |
+ activerecord (= 4.2.4) |
|
| 357 |
+ activesupport (= 4.2.4) |
|
| 358 | 358 |
bundler (>= 1.3.0, < 2.0) |
| 359 |
- railties (= 4.2.2) |
|
| 359 |
+ railties (= 4.2.4) |
|
| 360 | 360 |
sprockets-rails |
| 361 | 361 |
rails-deprecated_sanitizer (1.0.3) |
| 362 | 362 |
activesupport (>= 4.2.0.alpha) |
| 363 |
- rails-dom-testing (1.0.6) |
|
| 363 |
+ rails-dom-testing (1.0.7) |
|
| 364 | 364 |
activesupport (>= 4.2.0.beta, < 5.0) |
| 365 | 365 |
nokogiri (~> 1.6.0) |
| 366 | 366 |
rails-deprecated_sanitizer (>= 1.0.1) |
@@ -371,9 +371,9 @@ GEM |
||
| 371 | 371 |
rails_stdout_logging |
| 372 | 372 |
rails_serve_static_assets (0.0.4) |
| 373 | 373 |
rails_stdout_logging (0.0.3) |
| 374 |
- railties (4.2.2) |
|
| 375 |
- actionpack (= 4.2.2) |
|
| 376 |
- activesupport (= 4.2.2) |
|
| 374 |
+ railties (4.2.4) |
|
| 375 |
+ actionpack (= 4.2.4) |
|
| 376 |
+ activesupport (= 4.2.4) |
|
| 377 | 377 |
rake (>= 0.8.7) |
| 378 | 378 |
thor (>= 0.18.1, < 2.0) |
| 379 | 379 |
raindrops (0.13.0) |
@@ -452,9 +452,9 @@ GEM |
||
| 452 | 452 |
slop (3.6.0) |
| 453 | 453 |
spectrum-rails (1.3.4) |
| 454 | 454 |
railties (>= 3.1) |
| 455 |
- sprockets (3.2.0) |
|
| 455 |
+ sprockets (3.3.4) |
|
| 456 | 456 |
rack (~> 1.0) |
| 457 |
- sprockets-rails (2.3.1) |
|
| 457 |
+ sprockets-rails (2.3.2) |
|
| 458 | 458 |
actionpack (>= 3.0) |
| 459 | 459 |
activesupport (>= 3.0) |
| 460 | 460 |
sprockets (>= 2.8, < 4.0) |
@@ -584,7 +584,7 @@ DEPENDENCIES |
||
| 584 | 584 |
pry-rails |
| 585 | 585 |
quiet_assets |
| 586 | 586 |
rack (> 1.5.0) |
| 587 |
- rails (= 4.2.2) |
|
| 587 |
+ rails (= 4.2.4) |
|
| 588 | 588 |
rails_12factor |
| 589 | 589 |
rr |
| 590 | 590 |
rspec (~> 3.2) |