diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-15 02:53:26 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-15 02:53:26 +0200 |
| commit | 6f929ef801f625854b89eae5b440c04f5d0eef70 (patch) | |
| tree | dd5cbfd9d8376c58681d7a8a85cc33c594dfb081 /actionpack | |
| parent | 0d5a060710de0642d5e1538cd6a2de6a24bc77e0 (diff) | |
| parent | 3ba61ecb7f71ec37d6f6adc0c4806ab9e65b2c58 (diff) | |
| download | rails-6f929ef801f625854b89eae5b440c04f5d0eef70.tar.gz rails-6f929ef801f625854b89eae5b440c04f5d0eef70.tar.bz2 rails-6f929ef801f625854b89eae5b440c04f5d0eef70.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/controller/resources_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb index 6c8f470fba..4505cdabae 100644 --- a/actionpack/test/controller/resources_test.rb +++ b/actionpack/test/controller/resources_test.rb @@ -1,5 +1,5 @@ -require 'active_support/core_ext/object/try' require 'abstract_unit' +require 'active_support/core_ext/object/try' class ResourcesController < ActionController::Base def index() render :nothing => true end |