From bf1cb9b8e3835560a71250e762d362bbf6c5d714 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sun, 29 Mar 2020 03:07:53 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../sh-disable-archive-rate-throttle-default.yml          | 5 +++++
 changelogs/unreleased/wc-httio-accept-encoding.yml        | 5 +++++
 lib/gitlab/http_io.rb                                     | 2 +-
 lib/gitlab/rate_limit_helpers.rb                          | 2 +-
 spec/lib/gitlab/http_io_spec.rb                           | 8 ++++++++
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/sh-disable-archive-rate-throttle-default.yml
 create mode 100644 changelogs/unreleased/wc-httio-accept-encoding.yml

diff --git a/changelogs/unreleased/sh-disable-archive-rate-throttle-default.yml b/changelogs/unreleased/sh-disable-archive-rate-throttle-default.yml
new file mode 100644
index 00000000000..f9786f4e388
--- /dev/null
+++ b/changelogs/unreleased/sh-disable-archive-rate-throttle-default.yml
@@ -0,0 +1,5 @@
+---
+title: Disable archive rate limit by default
+merge_request: 28264
+author:
+type: fixed
diff --git a/changelogs/unreleased/wc-httio-accept-encoding.yml b/changelogs/unreleased/wc-httio-accept-encoding.yml
new file mode 100644
index 00000000000..c013ae57430
--- /dev/null
+++ b/changelogs/unreleased/wc-httio-accept-encoding.yml
@@ -0,0 +1,5 @@
+---
+title: Don't send 'accept-encoding' in HttpIO requests
+merge_request: 28239
+author:
+type: fixed
diff --git a/lib/gitlab/http_io.rb b/lib/gitlab/http_io.rb
index 6a9fb85b054..bd3ac139168 100644
--- a/lib/gitlab/http_io.rb
+++ b/lib/gitlab/http_io.rb
@@ -176,7 +176,7 @@ module Gitlab
     end
 
     def request
-      Net::HTTP::Get.new(uri).tap do |request|
+      Net::HTTP::Get.new(uri, { 'accept-encoding' => nil }).tap do |request|
         request.set_range(chunk_start, BUFFER_SIZE)
       end
     end
diff --git a/lib/gitlab/rate_limit_helpers.rb b/lib/gitlab/rate_limit_helpers.rb
index 2dcc888892b..653410a40a5 100644
--- a/lib/gitlab/rate_limit_helpers.rb
+++ b/lib/gitlab/rate_limit_helpers.rb
@@ -7,7 +7,7 @@ module Gitlab
     ARCHIVE_RATE_THROTTLE_KEY = :project_repositories_archive
 
     def archive_rate_limit_reached?(user, project)
-      return false unless Feature.enabled?(:archive_rate_limit, default_enabled: true)
+      return false unless Feature.enabled?(:archive_rate_limit)
 
       key = ARCHIVE_RATE_THROTTLE_KEY
 
diff --git a/spec/lib/gitlab/http_io_spec.rb b/spec/lib/gitlab/http_io_spec.rb
index 4bb5fb7c198..e53c361e169 100644
--- a/spec/lib/gitlab/http_io_spec.rb
+++ b/spec/lib/gitlab/http_io_spec.rb
@@ -319,4 +319,12 @@ describe Gitlab::HttpIO do
 
     it { is_expected.to be_truthy }
   end
+
+  describe '#send' do
+    subject(:send) { http_io.send(:request) }
+
+    it 'does not set the "accept-encoding" header' do
+      expect(send['accept-encoding']).to be_nil
+    end
+  end
 end