diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-08-02 09:52:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-02 09:52:14 -0500 |
| commit | c6974229d018b73f70e38ca8c8862473870d0274 (patch) | |
| tree | 51a95d540eeece7a77c44166caa1ebf120027eba /activejob | |
| parent | 4c3c4182a7bde6a736c0b489276da9f77fc430f2 (diff) | |
| parent | 869cb93de12141425b73f43e93f6e3730147b0ed (diff) | |
| download | rails-c6974229d018b73f70e38ca8c8862473870d0274.tar.gz rails-c6974229d018b73f70e38ca8c8862473870d0274.tar.bz2 rails-c6974229d018b73f70e38ca8c8862473870d0274.zip | |
Merge branch 'master' into active-storage-import
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/test/support/integration/adapters/sidekiq.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb index b63d16d248..ceb7fb61f2 100644 --- a/activejob/test/support/integration/adapters/sidekiq.rb +++ b/activejob/test/support/integration/adapters/sidekiq.rb @@ -38,7 +38,7 @@ module SidekiqJobsManager # Sidekiq is not warning-clean :( $VERBOSE = false - $stdin.reopen("/dev/null") + $stdin.reopen(File::NULL) $stdout.sync = true $stderr.sync = true |