diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-13 14:10:47 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-10-13 15:01:14 +0300 |
| commit | e281a13b2b07e2dcd3105fb5fa5d05fbf787168f (patch) | |
| tree | a6918e1e6480589b52c01c511a1cbfb678ce7484 /lib | |
| parent | 9bbe89e1ccaa70bf191b1a15ce18ead03a470f20 (diff) | |
Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'
Make "merge ongoing" check more consistent
Closes #39032
See merge request gitlab-org/gitlab-ce!14825
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/sidekiq_status.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/gitlab/sidekiq_status.rb b/lib/gitlab/sidekiq_status.rb index a0a2769cf9e..a1f689d94d9 100644 --- a/lib/gitlab/sidekiq_status.rb +++ b/lib/gitlab/sidekiq_status.rb @@ -51,6 +51,13 @@ module Gitlab self.num_running(job_ids).zero? end + # Returns true if the given job is running + # + # job_id - The Sidekiq job ID to check. + def self.running?(job_id) + num_running([job_id]) > 0 + end + # Returns the number of jobs that are running. # # job_ids - The Sidekiq job IDs to check. |