diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-24 15:08:06 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-24 15:08:06 +0100 |
| commit | 6545a68264682e8d0a0ee0e913fa98d92fef9428 (patch) | |
| tree | 8bffb69c52970ad72ab0f35de9acf5ef3db4257e /actionpack/lib/action_controller/metal | |
| parent | 84ebfa4550b2325c6c89bc13aa6f904ff88d0db7 (diff) | |
| download | rails-6545a68264682e8d0a0ee0e913fa98d92fef9428.tar.gz rails-6545a68264682e8d0a0ee0e913fa98d92fef9428.tar.bz2 rails-6545a68264682e8d0a0ee0e913fa98d92fef9428.zip | |
Fix failing tests after merge.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/helpers.rb | 1 |
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 |