diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-11 03:11:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-11 03:11:52 +0300 |
commit | 29b547f00429a063b266f6e6e478bba92c6a167a (patch) | |
tree | 5fbb39c281630f5c140c132b8a8894df1e92a516 /app | |
parent | 5f722a35635ac0a883d17ed6173cbebdb9a87477 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/observability/client.js | 2 | ||||
-rw-r--r-- | app/controllers/concerns/enforces_two_factor_authentication.rb | 2 | ||||
-rw-r--r-- | app/models/ci/build.rb | 2 | ||||
-rw-r--r-- | app/models/ci/job_artifact.rb | 2 | ||||
-rw-r--r-- | app/models/system/broadcast_message.rb | 2 | ||||
-rw-r--r-- | app/workers/run_pipeline_schedule_worker.rb | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/observability/client.js b/app/assets/javascripts/observability/client.js index 6c8156f2943..afdc4a7d55e 100644 --- a/app/assets/javascripts/observability/client.js +++ b/app/assets/javascripts/observability/client.js @@ -140,7 +140,7 @@ function filterObjToQueryParams(filterObj) { let value = rawValue; if (filterName === 'durationMs') { // converting durationMs to duration_nano - value *= 1000; + value *= 1000000; } if (paramName && value) { diff --git a/app/controllers/concerns/enforces_two_factor_authentication.rb b/app/controllers/concerns/enforces_two_factor_authentication.rb index 539feb3cf1c..24475909b62 100644 --- a/app/controllers/concerns/enforces_two_factor_authentication.rb +++ b/app/controllers/concerns/enforces_two_factor_authentication.rb @@ -73,7 +73,7 @@ module EnforcesTwoFactorAuthentication end def skip_two_factor? - session[:skip_two_factor] && session[:skip_two_factor] > Time.current + session[:skip_two_factor] && session[:skip_two_factor].future? end def two_factor_verifier diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 3a29c8f68cf..d2cf9058976 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -1091,7 +1091,7 @@ module Ci end def has_expiring_artifacts? - artifacts_expire_at.present? && artifacts_expire_at > Time.current + artifacts_expire_at.present? && artifacts_expire_at.future? end def job_jwt_variables diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb index 3f9d8f07b06..2a346f97958 100644 --- a/app/models/ci/job_artifact.rb +++ b/app/models/ci/job_artifact.rb @@ -310,7 +310,7 @@ module Ci end def expiring? - expire_at.present? && expire_at > Time.current + expire_at.present? && expire_at.future? end def expire_in diff --git a/app/models/system/broadcast_message.rb b/app/models/system/broadcast_message.rb index 332baea4449..06f0115ade6 100644 --- a/app/models/system/broadcast_message.rb +++ b/app/models/system/broadcast_message.rb @@ -125,7 +125,7 @@ module System end def future? - starts_at > Time.current + starts_at.future? end def now_or_future? diff --git a/app/workers/run_pipeline_schedule_worker.rb b/app/workers/run_pipeline_schedule_worker.rb index dab92e16ee3..61ef7494d38 100644 --- a/app/workers/run_pipeline_schedule_worker.rb +++ b/app/workers/run_pipeline_schedule_worker.rb @@ -22,7 +22,7 @@ class RunPipelineScheduleWorker # rubocop:disable Scalability/IdempotentWorker options.symbolize_keys! if options[:scheduling] - return if schedule.next_run_at > Time.current + return if schedule.next_run_at.future? update_next_run_at_for(schedule) end |