Add latest changes from gitlab-org/gitlab@master

4 files changed, 4 insertions, 7 deletions

diff --git a/lib/gitlab/ci/config/entry/product/parallel.rb b/lib/gitlab/ci/config/entry/product/parallel.rb
index e91714e3f5c..59cd3d3cf91 100644
--- a/lib/gitlab/ci/config/entry/product/parallel.rb
+++ b/lib/gitlab/ci/config/entry/product/parallel.rb
@@ -19,7 +19,7 @@ module Gitlab
 
               validations do
                 validates :config, numericality: { only_integer: true,
-                                                   greater_than_or_equal_to: 2,
+                                                   greater_than_or_equal_to: 1,
                                                    less_than_or_equal_to: Entry::Product::Parallel::PARALLEL_LIMIT },
                                    allow_nil: true
 
diff --git a/lib/gitlab/puma_logging/json_formatter.rb b/lib/gitlab/puma_logging/json_formatter.rb
index 9eeb980fc53..6d97b6615aa 100644
--- a/lib/gitlab/puma_logging/json_formatter.rb
+++ b/lib/gitlab/puma_logging/json_formatter.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'time'
 
 module Gitlab
   module PumaLogging
diff --git a/lib/gitlab/redis/wrapper.rb b/lib/gitlab/redis/wrapper.rb
index 288d5db15c6..45fe04835cc 100644
--- a/lib/gitlab/redis/wrapper.rb
+++ b/lib/gitlab/redis/wrapper.rb
@@ -55,15 +55,11 @@ module Gitlab
         def config_file_name
           [
             # Instance specific config sources:
-            ENV["GITLAB_REDIS_#{store_name.underscore.upcase}_CONFIG_FILE"],
             config_file_path("redis.#{store_name.underscore}.yml"),
 
             # The current Redis instance may have been split off from another one
             # (e.g. TraceChunks was split off from SharedState).
-            config_fallback&.config_file_name,
-
-            # Global config sources:
-            ENV['GITLAB_REDIS_CONFIG_FILE']
+            config_fallback&.config_file_name
           ].compact.first
         end
 
diff --git a/lib/gitlab/runtime.rb b/lib/gitlab/runtime.rb
index 7e9fb82fb8b..f74f1489405 100644
--- a/lib/gitlab/runtime.rb
+++ b/lib/gitlab/runtime.rb
@@ -38,7 +38,7 @@ module Gitlab
       end
 
       def puma?
-        !!defined?(::Puma)
+        !!defined?(::Puma::Server)
       end
 
       def sidekiq?