diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-11 13:56:05 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-11 19:00:35 -0300 |
| commit | 36dd1857dc097b6fbc65396bfabaa152da9c899f (patch) | |
| tree | 3be886c3c090fc05d783d73b2709ec9d94c841e6 /actionmailer | |
| parent | a00228c1a35578c4bf4d462eec977a50120288da (diff) | |
| download | rails-36dd1857dc097b6fbc65396bfabaa152da9c899f.tar.gz rails-36dd1857dc097b6fbc65396bfabaa152da9c899f.tar.bz2 rails-36dd1857dc097b6fbc65396bfabaa152da9c899f.zip | |
Remove useless load path modifications
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer.rb | 3 | ||||
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 1045dd58ef..e45a1cd5ff 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -21,9 +21,6 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -actionpack_path = File.expand_path('../../../actionpack/lib', __FILE__) -$:.unshift(actionpack_path) if File.directory?(actionpack_path) && !$:.include?(actionpack_path) - require 'abstract_controller' require 'action_view' require 'action_mailer/version' diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 487102b564..99c44179fd 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -8,9 +8,6 @@ silence_warnings do Encoding.default_external = "UTF-8" end -lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") -$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) - require 'minitest/autorun' require 'action_mailer' require 'action_mailer/test_case' |