diff options
| author | Dillon Welch <daw0328@gmail.com> | 2017-11-03 19:58:28 -0700 |
|---|---|---|
| committer | Dillon Welch <daw0328@gmail.com> | 2017-11-03 19:58:28 -0700 |
| commit | 0f28957edd6a9c281491c854b455180efc040a1c (patch) | |
| tree | 577d46d88937d4cc811e6860ce3cbdb2a1dad27a /activejob | |
| parent | ec13ef75260f6d143e947b0e5176e35e4c1229c2 (diff) | |
| parent | 9ec67362054e874ed905310a79b670941fa397af (diff) | |
| download | rails-0f28957edd6a9c281491c854b455180efc040a1c.tar.gz rails-0f28957edd6a9c281491c854b455180efc040a1c.tar.bz2 rails-0f28957edd6a9c281491c854b455180efc040a1c.zip | |
Merge remote-tracking branch 'upstream/master' into nofollow-change
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/test/support/delayed_job/delayed/backend/test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activejob/test/support/delayed_job/delayed/backend/test.rb b/activejob/test/support/delayed_job/delayed/backend/test.rb index 4721c1cc17..9280a37a5c 100644 --- a/activejob/test/support/delayed_job/delayed/backend/test.rb +++ b/activejob/test/support/delayed_job/delayed/backend/test.rb @@ -77,7 +77,7 @@ module Delayed self.locked_by = worker end - return true + true end def self.db_time_now |