Add latest changes from gitlab-org/gitlab@master

4 files changed, 4 insertions, 16 deletions

diff --git a/lib/gitlab/checks/matching_merge_request.rb b/lib/gitlab/checks/matching_merge_request.rb
index e5ce862264f..15178597a99 100644
--- a/lib/gitlab/checks/matching_merge_request.rb
+++ b/lib/gitlab/checks/matching_merge_request.rb
@@ -17,7 +17,7 @@ module Gitlab
         #
         # 1. Sidekiq: MergeService runs and updates the merge request in a locked state.
         # 2. Gitaly: The UserMergeBranch RPC runs.
-        # 3. Gitaly (gitaly-ruby): This RPC calls the pre-receive hook.
+        # 3. Gitaly: The RPC calls the pre-receive hook.
         # 4. Rails: This hook makes an API request to /api/v4/internal/allowed.
         # 5. Rails: This API check does a SQL query for locked merge
         #    requests with a matching SHA.
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index dedf50866e9..80d0fd17568 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -54,8 +54,6 @@ module Gitlab
       # state.
       alias_method :object_pool_remote_name, :gl_repository
 
-      # This initializer method is only used on the client side (gitlab-ce).
-      # Gitaly-ruby uses a different initializer.
       def initialize(storage, relative_path, gl_repository, gl_project_path, container: nil)
         @storage = storage
         @relative_path = relative_path
diff --git a/lib/gitlab/setup_helper.rb b/lib/gitlab/setup_helper.rb
index 1e42003b203..2e09a4fce12 100644
--- a/lib/gitlab/setup_helper.rb
+++ b/lib/gitlab/setup_helper.rb
@@ -80,7 +80,7 @@ module Gitlab
         # because it uses a Unix socket.
         # For development and testing purposes, an extra storage is added to gitaly,
         # which is not known to Rails, but must be explicitly stubbed.
-        def configuration_toml(gitaly_dir, storage_paths, options, gitaly_ruby: true)
+        def configuration_toml(gitaly_dir, storage_paths, options)
           storages = []
           address = nil
 
@@ -128,7 +128,6 @@ module Gitlab
           FileUtils.mkdir(runtime_dir) unless File.exist?(runtime_dir)
           config[:runtime_dir] = runtime_dir
 
-          config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby
           config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }
           config[:bin_dir] = File.expand_path(File.join(gitaly_dir, '_build', 'bin')) # binaries by default are in `_build/bin`
           config[:gitlab] = { url: Gitlab.config.gitlab.url }
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index b4d59ba9412..4c19d94f4a1 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -26,17 +26,8 @@ Usage: rake "gitlab:gitaly:install[/installation/dir,/storage/path]")
       Gitlab::SetupHelper::Gitaly.create_configuration(args.dir, storage_paths)
 
       Dir.chdir(args.dir) do
-        Bundler.with_original_env do
-          env = { "RUBYOPT" => nil, "BUNDLE_GEMFILE" => nil }
-
-          if Rails.env.test?
-            env["GEM_HOME"] = Bundler.bundle_path.to_s
-            env["BUNDLE_DEPLOYMENT"] = 'false'
-          end
-
-          output, status = Gitlab::Popen.popen([make_cmd, 'clean', 'all'], nil, env)
-          raise "Gitaly failed to compile: #{output}" unless status&.zero?
-        end
+        output, status = Gitlab::Popen.popen([make_cmd, 'clean', 'all'])
+        raise "Gitaly failed to compile: #{output}" unless status&.zero?
       end
     end