Add latest changes from gitlab-org/gitlab@master

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