aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG.md5
-rw-r--r--railties/lib/rails/paths.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index ca2bd62b43..8b391e9031 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