diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-12 12:51:02 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-12 12:51:02 -0200 |
| commit | 4cd146bae5483cb0fdbde35b5340e9543e70dd1a (patch) | |
| tree | 4af8ab00aebfd3ec96b79d9e3d42c75ed8678710 | |
| parent | 1361b676d3a51aa0fca299f432e75032dd29a9d9 (diff) | |
| parent | 56dc95bc92301dae89e5d6b5ca306b043b095661 (diff) | |
| download | rails-4cd146bae5483cb0fdbde35b5340e9543e70dd1a.tar.gz rails-4cd146bae5483cb0fdbde35b5340e9543e70dd1a.tar.bz2 rails-4cd146bae5483cb0fdbde35b5340e9543e70dd1a.zip | |
Merge pull request #17593 from igas/paths-unshift-arity
Fix Rails::Paths::Path.unshift interface
| -rw-r--r-- | railties/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | railties/lib/rails/paths.rb | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index d1da34588b..92187f3d91 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +* `Rails::Paths::Path.unshift` is now have the same interface as + `Array.unshift`. + + *Igor Kapkov* + * `secret_token` is now saved in `Rails.application.secrets.secret_token` and it falls back to the value of `config.secret_token` when it is not present in `config/secrets.yml`. diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb index 3eb66c07af..d11804af17 100644 --- a/railties/lib/rails/paths.rb +++ b/railties/lib/rails/paths.rb @@ -167,8 +167,8 @@ module Rails @paths.concat paths end - def unshift(path) - @paths.unshift path + def unshift(*paths) + @paths.unshift(*paths) end def to_ary |