Commit 074a1244 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rename-timeouted-to-timed-out-ee' into 'master'

Rename `timeouted?` to `timed_out?`

Closes #6796

See merge request gitlab-org/gitlab-ee!15124
parents ee35c199 2a10bb66
...@@ -33,7 +33,7 @@ module Clusters ...@@ -33,7 +33,7 @@ module Clusters
end end
def check_timeout def check_timeout
if timeouted? if timed_out?
begin begin
app.make_update_errored!('Update timed out') app.make_update_errored!('Update timed out')
ensure ensure
...@@ -45,7 +45,7 @@ module Clusters ...@@ -45,7 +45,7 @@ module Clusters
end end
end end
def timeouted? def timed_out?
Time.now.utc - app.updated_at.to_time.utc > ::ClusterWaitForAppUpdateWorker::TIMEOUT Time.now.utc - app.updated_at.to_time.utc > ::ClusterWaitForAppUpdateWorker::TIMEOUT
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment