aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/helpers.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-24 15:08:06 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-24 15:08:06 +0100
commit6545a68264682e8d0a0ee0e913fa98d92fef9428 (patch)
tree8bffb69c52970ad72ab0f35de9acf5ef3db4257e /actionpack/lib/action_controller/metal/helpers.rb
parent84ebfa4550b2325c6c89bc13aa6f904ff88d0db7 (diff)
downloadrails-6545a68264682e8d0a0ee0e913fa98d92fef9428.tar.gz
rails-6545a68264682e8d0a0ee0e913fa98d92fef9428.tar.bz2
rails-6545a68264682e8d0a0ee0e913fa98d92fef9428.zip
Fix failing tests after merge.
Diffstat (limited to 'actionpack/lib/action_controller/metal/helpers.rb')
-rw-r--r--actionpack/lib/action_controller/metal/helpers.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index 757ce3c319..0e3db86861 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -111,6 +111,7 @@ module ActionController
extract = /^#{Regexp.quote(path)}\/?(.*)_helper.rb$/
helpers += Dir["#{path}/**/*_helper.rb"].map { |file| file.sub(extract, '\1') }
end
+ helpers.sort!
helpers.uniq!
helpers
end