diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-05-25 22:48:47 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-05-25 22:48:47 +0200 |
| commit | 00e1d0832e1242fe41cf43490b0a3a21a40f3c26 (patch) | |
| tree | 06d3fcf35727a37f78885fc63fe15ff265aa309a /activesupport/lib/active_support/core_ext/kernel | |
| parent | d25b7c2eeefff3a0abf7b532c10ce25a71d0fba2 (diff) | |
| parent | 03f418370a4266e414ff32706381bb2b60baadfc (diff) | |
| download | rails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.tar.gz rails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.tar.bz2 rails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
actionmailer/lib/action_mailer/base.rb
activesupport/lib/active_support/core_ext/kernel/requires.rb
Diffstat (limited to 'activesupport/lib/active_support/core_ext/kernel')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/kernel/agnostics.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/kernel/agnostics.rb b/activesupport/lib/active_support/core_ext/kernel/agnostics.rb index c0cb4fb427..64837d87aa 100644 --- a/activesupport/lib/active_support/core_ext/kernel/agnostics.rb +++ b/activesupport/lib/active_support/core_ext/kernel/agnostics.rb @@ -1,11 +1,11 @@ class Object # Makes backticks behave (somewhat more) similarly on all platforms. # On win32 `nonexistent_command` raises Errno::ENOENT; on Unix, the - # spawned shell prints a message to stderr and sets $?. We emulate + # spawned shell prints a message to stderr and sets $?. We emulate # Unix on the former but not the latter. def `(command) #:nodoc: super rescue Errno::ENOENT => e STDERR.puts "#$0: #{e}" end -end
\ No newline at end of file +end |