Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules

* upstream/master: (126 commits)
  Update VERSION to 10.3.0-pre
  Update CHANGELOG.md for 10.2.0
  default fill color for SVGs
  ignore hashed repos (for now) when using `rake gitlab:cleanup:repos`
  Use Redis cache for branch existence checks
  Update CONTRIBUTING.md: Link definition of done to criteria
  Use `make install` for Gitaly setups in non-test environments
  FileUploader should check for hashed_storage?(:attachments) to use disk_path
  Set the default gitlab-shell timeout to 3 hours
  Update composite pipelines index to include "id"
  Use arrays in Pipeline#latest_builds_with_artifacts
  Fix blank states using old css
  Skip confirmation user api
  Custom issue tracker
  Revert "check for `read_only?` first before seeing if request is disallowed"
  add `#with_metadata` scope to remove a N+1 from the notes' API
  Fix promoting milestone updating all issuables without milestone
  Batchload blobs for diff generation
  check for `read_only?` first before seeing if request is disallowed
  use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_helpers`
  ...

3 files changed, 15 insertions, 54 deletions

diff --git a/lib/tasks/gitlab/cleanup.rake b/lib/tasks/gitlab/cleanup.rake
index 8ae1b6a626a..301affc9522 100644
--- a/lib/tasks/gitlab/cleanup.rake
+++ b/lib/tasks/gitlab/cleanup.rake
@@ -59,7 +59,11 @@ namespace :gitlab do
               .sub(%r{^/*}, '')
               .chomp('.git')
               .chomp('.wiki')
-            next if Project.find_by_full_path(repo_with_namespace)
+
+            # TODO ignoring hashed repositories for now.  But revisit to fully support
+            # possible orphaned hashed repos
+            next if repo_with_namespace.start_with?('@hashed/') || Project.find_by_full_path(repo_with_namespace)
+
             new_path = path + move_suffix
             puts path.inspect + ' -> ' + new_path.inspect
             File.rename(path, new_path)
@@ -75,6 +79,7 @@ namespace :gitlab do
 
       User.find_each do |user|
         next unless user.ldap_user?
+
         print "#{user.name} (#{user.ldap_identity.extern_uid}) ..."
         if Gitlab::LDAP::Access.allowed?(user)
           puts " [OK]".color(:green)
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index 8377fe3269d..f2002d7a426 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -14,18 +14,18 @@ namespace :gitlab do
 
       checkout_or_clone_version(version: version, repo: args.repo, target_dir: args.dir)
 
+      command = %w[/usr/bin/env -u RUBYOPT -u BUNDLE_GEMFILE]
+
       _, status = Gitlab::Popen.popen(%w[which gmake])
-      command = status.zero? ? ['gmake'] : ['make']
+      command << (status.zero? ? 'gmake' : 'make')
 
-      if Rails.env.test?
-        command += %W[BUNDLE_PATH=#{Bundler.bundle_path}]
-      end
+      command << 'BUNDLE_FLAGS=--no-deployment' if Rails.env.test?
 
       Dir.chdir(args.dir) do
         create_gitaly_configuration
         # In CI we run scripts/gitaly-test-build instead of this command
         unless ENV['CI'].present?
-          Bundler.with_original_env { run_command!(%w[/usr/bin/env -u RUBYOPT -u BUNDLE_GEMFILE] + command) }
+          Bundler.with_original_env { run_command!(command) }
         end
       end
     end
@@ -82,9 +82,12 @@ namespace :gitlab do
     end
 
     def create_gitaly_configuration
-      File.open("config.toml", "w") do |f|
+      File.open("config.toml", File::WRONLY | File::CREAT | File::EXCL) do |f|
         f.puts gitaly_configuration_toml
       end
+    rescue Errno::EEXIST
+      puts "Skipping config.toml generation:"
+      puts "A configuration file already exists."
     rescue ArgumentError => e
       puts "Skipping config.toml generation:"
       puts e.message
diff --git a/lib/tasks/gitlab/sidekiq.rake b/lib/tasks/gitlab/sidekiq.rake
deleted file mode 100644
index 6cbc83b8973..00000000000
--- a/lib/tasks/gitlab/sidekiq.rake
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace :gitlab do
-  namespace :sidekiq do
-    QUEUE = 'queue:post_receive'.freeze
-
-    desc 'Drop all Sidekiq PostReceive jobs for a given project'
-    task :drop_post_receive, [:project] => :environment do |t, args|
-      unless args.project.present?
-        abort "Please specify the project you want to drop PostReceive jobs for:\n  rake gitlab:sidekiq:drop_post_receive[group/project]"
-      end
-      project_path = Project.find_by_full_path(args.project).repository.path_to_repo
-
-      Sidekiq.redis do |redis|
-        unless redis.exists(QUEUE)
-          abort "Queue #{QUEUE} is empty"
-        end
-
-        temp_queue = "#{QUEUE}_#{Time.now.to_i}"
-        redis.rename(QUEUE, temp_queue)
-
-        # At this point, then post_receive queue is empty. It may be receiving
-        # new jobs already. We will repopulate it with the old jobs, skipping the
-        # ones we want to drop.
-        dropped = 0
-        while (job = redis.lpop(temp_queue))
-          if repo_path(job) == project_path
-            dropped += 1
-          else
-            redis.rpush(QUEUE, job)
-          end
-        end
-        # The temp_queue will delete itself after we have popped all elements
-        # from it
-
-        puts "Dropped #{dropped} jobs containing #{project_path} from #{QUEUE}"
-      end
-    end
-
-    def repo_path(job)
-      job_args = JSON.parse(job)['args']
-      if job_args
-        job_args.first
-      else
-        nil
-      end
-    end
-  end
-end