Automatic merge of gitlab-org/gitlab master

Gemfile

@@ -196,7 +196,7 @@ gem 'acts-as-taggable-on', '~> 7.0'
 
 # Background jobs
 gem 'sidekiq', '~> 6.2.2'
-gem 'sidekiq-cron', '~> 1.2'
+gem 'sidekiq-cron', '~> 1.0'
 gem 'redis-namespace', '~> 1.8.1'
 gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch'
 

Gemfile.lock

@@ -1172,7 +1172,7 @@ GEM
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
-    sidekiq-cron (1.2.0)
+    sidekiq-cron (1.0.4)
       fugit (~> 1.1)
       sidekiq (>= 4.2.1)
     signet (0.14.0)
@@ -1611,7 +1611,7 @@ DEPENDENCIES
   settingslogic (~> 2.0.9)
   shoulda-matchers (~> 4.0.1)
   sidekiq (~> 6.2.2)
-  sidekiq-cron (~> 1.2)
+  sidekiq-cron (~> 1.0)
   simple_po_parser (~> 1.1.2)
   simplecov (~> 0.18.5)
   simplecov-cobertura (~> 1.3.1)

doc/user/project/merge_requests/approvals/settings.md

@@ -70,8 +70,14 @@ their own. To do this:
    it can't be changed at the project level.
 1. Select **Save changes**.
 
-Even with this configuration, [code owners](../../code_owners.md) who contribute
-to a merge request can approve merge requests that affect files they own.
+Depending on your version of GitLab, [code owners](../../code_owners.md) who commit
+to a merge request may or may not be able to approve the work:
+
+- In GitLab 13.10 and earlier, [code owners](../../code_owners.md) who commit
+  to a merge request can approve it, even if the merge request affects files they own.
+- In [GitLab 13.11 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/331548),
+  [code owners](../../code_owners.md) who commit
+  to a merge request cannot approve it, when the merge request affects files they own.
 
 To learn more about the [differences between authors and committers](https://git-scm.com/book/en/v2/Git-Basics-Viewing-the-Commit-History),
 read the official Git documentation for an explanation.

lib/gitlab/sidekiq_logging/json_formatter.rb

@@ -2,7 +2,6 @@
 
 # This is needed for sidekiq-cluster
 require 'json'
-require 'sidekiq/job_retry'
 
 module Gitlab
   module SidekiqLogging

lib/gitlab/sidekiq_logging/structured_logger.rb

@@ -2,8 +2,6 @@
 
 require 'active_record'
 require 'active_record/log_subscriber'
-require 'sidekiq/job_logger'
-require 'sidekiq/job_retry'
 
 module Gitlab
   module SidekiqLogging

lib/gitlab/sidekiq_middleware/monitor.rb

 # frozen_string_literal: true
 
-require 'sidekiq/job_retry'
-
 module Gitlab
   module SidekiqMiddleware
     class Monitor

scripts/gitaly-test-build

@@ -13,6 +13,8 @@ class GitalyTestBuild
   include GitalySetup
 
   def run
+    set_bundler_config
+
     # If we have the binaries from the cache, we can skip building them again
     if File.exist?(tmp_tests_gitaly_bin_dir)
       GitalySetup::LOGGER.debug "Gitaly binary already built. Skip building...\n"

scripts/gitaly-test-spawn

@@ -9,6 +9,7 @@ class GitalyTestSpawn
   include GitalySetup
 
   def run
+    set_bundler_config
     install_gitaly_gems if ENV['CI']
     check_gitaly_config!
 

spec/support/helpers/gitaly_setup.rb

@@ -9,7 +9,6 @@
 require 'securerandom'
 require 'socket'
 require 'logger'
-require 'bundler'
 
 module GitalySetup
   LOGGER = begin
@@ -47,26 +46,13 @@ module GitalySetup
     File.join(tmp_tests_gitlab_shell_dir, '.gitlab_shell_secret')
   end
 
-  # Return the path of the vendored gems in <gdk>/gitaly, if exists
-  def gdk_gitaly_ruby_gem_path
-    gitaly_ruby_path = File.expand_path('../../../../gitaly/ruby/', __dir__)
-    bundle_config_path = File.join(gitaly_ruby_path, '.bundle')
-    bundle_path = Bundler::Settings.new(bundle_config_path).path
-
-    return if bundle_path.use_system_gems?
-
-    File.expand_path(bundle_path.explicit_path, gitaly_ruby_path)
-  end
-
   def env
     {
       'HOME' => File.expand_path('tmp/tests'),
       'GEM_PATH' => Gem.path.join(':'),
-      'BUNDLE_IGNORE_CONFIG' => '1',
+      'BUNDLE_APP_CONFIG' => File.join(gemfile_dir, '.bundle'),
+      'BUNDLE_INSTALL_FLAGS' => nil,
       'BUNDLE_GEMFILE' => gemfile,
-      'BUNDLE_PATH' => bundle_path,
-      'BUNDLE_JOBS' => '4',
-      'BUNDLE_RETRY' => '3',
       'RUBYOPT' => nil,
 
       # Git hooks can't run during tests as the internal API is not running.
@@ -75,13 +61,17 @@ module GitalySetup
     }
   end
 
-  def bundle_path
+  # rubocop:disable GitlabSecurity/SystemCommandInjection
+  def set_bundler_config
+    system('bundle config set --local jobs 4', chdir: gemfile_dir)
+    system('bundle config set --local retry 3', chdir: gemfile_dir)
+
     if ENV['CI']
-      File.expand_path('../../../vendor/gitaly-ruby', __dir__)
-    else
-      gdk_gitaly_ruby_gem_path || File.expand_path(Bundler.configured_bundle_path.base_path)
+      bundle_path = File.expand_path('../../../vendor/gitaly-ruby', __dir__)
+      system('bundle', 'config', 'set', '--local', 'path', bundle_path, chdir: gemfile_dir)
     end
   end
+  # rubocop:enable GitlabSecurity/SystemCommandInjection
 
   def config_path(service)
     case service