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 /actionview | |
| 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 'actionview')
| -rw-r--r-- | actionview/Rakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/Rakefile b/actionview/Rakefile index 0d974cb087..20dfa4e114 100644 --- a/actionview/Rakefile +++ b/actionview/Rakefile @@ -37,7 +37,7 @@ namespace :test do start_time = Time.now loop do - break if system("lsof -i :4567 >/dev/null") + break if system("lsof -i :4567", 1 => File::NULL) if Time.now - start_time > 5 puts "Timed out after 5 seconds" |