diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-19 12:09:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-19 12:09:58 +0300 |
commit | 7866b83bf40c94e8a32d21fdea97a5e142e08f80 (patch) | |
tree | 5102a3fd55f3908048de22a20f25a39425cc87a8 /lib/gitlab | |
parent | 0bfb62457ba5122c9bf30bed3ecd20759a9a16bd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/database.rb | 1 | ||||
-rw-r--r-- | lib/gitlab/metrics/dashboard/stages/track_panel_type.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/sidekiq_versioning/middleware.rb | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index e7df9fd27f0..859b53b9887 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -22,7 +22,6 @@ module Gitlab # https://www.postgresql.org/docs/9.2/static/datatype-numeric.html MAX_INT_VALUE = 2147483647 - MIN_INT_VALUE = -2147483648 # The max value between MySQL's TIMESTAMP and PostgreSQL's timestampz: # https://www.postgresql.org/docs/9.1/static/datatype-datetime.html diff --git a/lib/gitlab/metrics/dashboard/stages/track_panel_type.rb b/lib/gitlab/metrics/dashboard/stages/track_panel_type.rb index 6e4ce770fa3..71da779d16c 100644 --- a/lib/gitlab/metrics/dashboard/stages/track_panel_type.rb +++ b/lib/gitlab/metrics/dashboard/stages/track_panel_type.rb @@ -18,7 +18,7 @@ module Gitlab def track_panel_type(panel) panel_type = panel[:type] - Gitlab::Tracking.event('MetricsDashboard::Chart', 'chart_rendered', label: 'Chart Type', value: panel_type) + Gitlab::Tracking.event('MetricsDashboard::Chart', 'chart_rendered', label: panel_type) end end end diff --git a/lib/gitlab/sidekiq_versioning/middleware.rb b/lib/gitlab/sidekiq_versioning/middleware.rb index e2d692c619b..2ffee617376 100644 --- a/lib/gitlab/sidekiq_versioning/middleware.rb +++ b/lib/gitlab/sidekiq_versioning/middleware.rb @@ -4,7 +4,7 @@ module Gitlab module SidekiqVersioning class Middleware def call(worker, job, queue) - worker.job_version = job['version'] if worker.is_a?(ApplicationWorker) && Feature.enabled?(:sidekiq_versioning) + worker.job_version = job['version'] if worker.is_a?(ApplicationWorker) yield end |