Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 54 deletions

diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb
index a21727e5691..40252cf65cd 100644
--- a/spec/controllers/projects/raw_controller_spec.rb
+++ b/spec/controllers/projects/raw_controller_spec.rb
@@ -295,21 +295,6 @@ RSpec.describe Projects::RawController, feature_category: :source_code_managemen
           expect(response).to have_gitlab_http_status(:not_modified)
         end
       end
-
-      context 'when improve_blobs_cache_headers disabled' do
-        before do
-          stub_feature_flags(improve_blobs_cache_headers: false)
-        end
-
-        it 'uses weak etags with a restricted set of headers' do
-          sign_in create(:user)
-          request_file
-
-          expect(response.headers['ETag']).to eq("W/\"bdd5aa537c1e1f6d1b66de4bac8a6132\"")
-          expect(response.cache_control[:no_store]).to be_nil
-          expect(response.header['Cache-Control']).to eq('max-age=60, public')
-        end
-      end
     end
   end
 end
diff --git a/spec/controllers/projects/repositories_controller_spec.rb b/spec/controllers/projects/repositories_controller_spec.rb
index bc2a3abc2d6..8186176a46b 100644
--- a/spec/controllers/projects/repositories_controller_spec.rb
+++ b/spec/controllers/projects/repositories_controller_spec.rb
@@ -174,45 +174,6 @@ RSpec.describe Projects::RepositoriesController, feature_category: :source_code_
           end
         end
 
-        context 'when improve_blobs_cache_headers is disabled' do
-          before do
-            stub_feature_flags(improve_blobs_cache_headers: false)
-          end
-
-          context 'when project is public' do
-            let(:project) { create(:project, :repository, :public) }
-
-            it 'sets appropriate caching headers' do
-              get_archive
-
-              expect(response).to have_gitlab_http_status(:ok)
-              expect(response.header['ETag']).to be_present
-              expect(response.header['Cache-Control']).to eq('max-age=60, public')
-            end
-
-            context 'and repo is private' do
-              let(:project) { create(:project, :repository, :public, :repository_private) }
-
-              it 'sets appropriate caching headers' do
-                get_archive
-
-                expect(response).to have_gitlab_http_status(:ok)
-                expect(response.header['ETag']).to be_present
-                expect(response.header['Cache-Control']).to eq('max-age=60, private')
-              end
-            end
-          end
-
-          context 'when ref is a commit SHA' do
-            it 'max-age is set to 3600 in Cache-Control header' do
-              get_archive('ddd0f15ae83993f5cb66a927a28673882e99100b')
-
-              expect(response).to have_gitlab_http_status(:ok)
-              expect(response.header['Cache-Control']).to eq('max-age=3600, private')
-            end
-          end
-        end
-
         context 'when If-None-Modified header is set' do
           it 'returns a 304 status' do
             # Get the archive cached first