Add latest changes from gitlab-org/gitlab@master

2 files changed, 64 insertions, 224 deletions

diff --git a/spec/controllers/groups/uploads_controller_spec.rb b/spec/controllers/groups/uploads_controller_spec.rb
index 8fcc3a7fccf..645360289d1 100644
--- a/spec/controllers/groups/uploads_controller_spec.rb
+++ b/spec/controllers/groups/uploads_controller_spec.rb
@@ -67,30 +67,10 @@ RSpec.describe Groups::UploadsController do
       end
 
       context "when not signed in" do
-        context "enforce_auth_checks_on_uploads feature flag" do
-          context "with flag enabled" do
-            before do
-              stub_feature_flags(enforce_auth_checks_on_uploads: true)
-            end
+        it "responds with appropriate status" do
+          show_upload
 
-            it "responds with appropriate status" do
-              show_upload
-
-              expect(response).to have_gitlab_http_status(:ok)
-            end
-          end
-
-          context "with flag disabled" do
-            before do
-              stub_feature_flags(enforce_auth_checks_on_uploads: false)
-            end
-
-            it "responds with status 200" do
-              show_upload
-
-              expect(response).to have_gitlab_http_status(:ok)
-            end
-          end
+          expect(response).to have_gitlab_http_status(:ok)
         end
       end
 
@@ -100,30 +80,10 @@ RSpec.describe Groups::UploadsController do
         end
 
         context "when the user doesn't have access to the model" do
-          context "enforce_auth_checks_on_uploads feature flag" do
-            context "with flag enabled" do
-              before do
-                stub_feature_flags(enforce_auth_checks_on_uploads: true)
-              end
-
-              it "responds with status 200" do
-                show_upload
-
-                expect(response).to have_gitlab_http_status(:ok)
-              end
-            end
-          end
-
-          context "with flag disabled" do
-            before do
-              stub_feature_flags(enforce_auth_checks_on_uploads: false)
-            end
-
-            it "responds with status 200" do
-              show_upload
+          it "responds with status 200" do
+            show_upload
 
-              expect(response).to have_gitlab_http_status(:ok)
-            end
+            expect(response).to have_gitlab_http_status(:ok)
           end
         end
       end
@@ -135,30 +95,10 @@ RSpec.describe Groups::UploadsController do
       end
 
       context "when not signed in" do
-        context "enforce_auth_checks_on_uploads feature flag" do
-          context "with flag enabled" do
-            before do
-              stub_feature_flags(enforce_auth_checks_on_uploads: true)
-            end
+        it "responds with appropriate status" do
+          show_upload
 
-            it "responds with appropriate status" do
-              show_upload
-
-              expect(response).to have_gitlab_http_status(:ok)
-            end
-          end
-
-          context "with flag disabled" do
-            before do
-              stub_feature_flags(enforce_auth_checks_on_uploads: false)
-            end
-
-            it "responds with status 200" do
-              show_upload
-
-              expect(response).to have_gitlab_http_status(:ok)
-            end
-          end
+          expect(response).to have_gitlab_http_status(:ok)
         end
       end
 
@@ -168,30 +108,10 @@ RSpec.describe Groups::UploadsController do
         end
 
         context "when the user doesn't have access to the model" do
-          context "enforce_auth_checks_on_uploads feature flag" do
-            context "with flag enabled" do
-              before do
-                stub_feature_flags(enforce_auth_checks_on_uploads: true)
-              end
-
-              it "responds with status 200" do
-                show_upload
-
-                expect(response).to have_gitlab_http_status(:ok)
-              end
-            end
-          end
-
-          context "with flag disabled" do
-            before do
-              stub_feature_flags(enforce_auth_checks_on_uploads: false)
-            end
-
-            it "responds with status 200" do
-              show_upload
+          it "responds with status 200" do
+            show_upload
 
-              expect(response).to have_gitlab_http_status(:ok)
-            end
+            expect(response).to have_gitlab_http_status(:ok)
           end
         end
       end
diff --git a/spec/controllers/projects/uploads_controller_spec.rb b/spec/controllers/projects/uploads_controller_spec.rb
index 6d2db25ade2..01635f2e158 100644
--- a/spec/controllers/projects/uploads_controller_spec.rb
+++ b/spec/controllers/projects/uploads_controller_spec.rb
@@ -86,47 +86,27 @@ RSpec.describe Projects::UploadsController do
       end
 
       context "when not signed in" do
-        context "enforce_auth_checks_on_uploads feature flag" do
-          context "with flag enabled" do
-            before do
-              stub_feature_flags(enforce_auth_checks_on_uploads: true)
-            end
-
-            context 'when the project has setting enforce_auth_checks_on_uploads true' do
-              before do
-                model.update!(enforce_auth_checks_on_uploads: true)
-              end
-
-              it "responds with status 302" do
-                show_upload
-
-                expect(response).to have_gitlab_http_status(:redirect)
-              end
-            end
-
-            context 'when the project has setting enforce_auth_checks_on_uploads false' do
-              before do
-                model.update!(enforce_auth_checks_on_uploads: false)
-              end
+        context 'when the project has setting enforce_auth_checks_on_uploads true' do
+          before do
+            model.update!(enforce_auth_checks_on_uploads: true)
+          end
 
-              it "responds with status 200" do
-                show_upload
+          it "responds with status 302" do
+            show_upload
 
-                expect(response).to have_gitlab_http_status(:ok)
-              end
-            end
+            expect(response).to have_gitlab_http_status(:redirect)
           end
+        end
 
-          context "with flag disabled" do
-            before do
-              stub_feature_flags(enforce_auth_checks_on_uploads: false)
-            end
+        context 'when the project has setting enforce_auth_checks_on_uploads false' do
+          before do
+            model.update!(enforce_auth_checks_on_uploads: false)
+          end
 
-            it "responds with status 200" do
-              show_upload
+          it "responds with status 200" do
+            show_upload
 
-              expect(response).to have_gitlab_http_status(:ok)
-            end
+            expect(response).to have_gitlab_http_status(:ok)
           end
         end
       end
@@ -137,41 +117,21 @@ RSpec.describe Projects::UploadsController do
         end
 
         context "when the user doesn't have access to the model" do
-          context "enforce_auth_checks_on_uploads feature flag" do
-            context "with flag enabled" do
-              before do
-                stub_feature_flags(enforce_auth_checks_on_uploads: true)
-              end
-
-              context 'when the project has setting enforce_auth_checks_on_uploads true' do
-                before do
-                  model.update!(enforce_auth_checks_on_uploads: true)
-                end
-
-                it "responds with status 404" do
-                  show_upload
-
-                  expect(response).to have_gitlab_http_status(:not_found)
-                end
-              end
-
-              context 'when the project has setting enforce_auth_checks_on_uploads false' do
-                before do
-                  model.update!(enforce_auth_checks_on_uploads: false)
-                end
-
-                it "responds with status 200" do
-                  show_upload
-
-                  expect(response).to have_gitlab_http_status(:ok)
-                end
-              end
+          context 'when the project has setting enforce_auth_checks_on_uploads true' do
+            before do
+              model.update!(enforce_auth_checks_on_uploads: true)
+            end
+
+            it "responds with status 404" do
+              show_upload
+
+              expect(response).to have_gitlab_http_status(:not_found)
             end
           end
 
-          context "with flag disabled" do
+          context 'when the project has setting enforce_auth_checks_on_uploads false' do
             before do
-              stub_feature_flags(enforce_auth_checks_on_uploads: false)
+              model.update!(enforce_auth_checks_on_uploads: false)
             end
 
             it "responds with status 200" do
@@ -190,47 +150,27 @@ RSpec.describe Projects::UploadsController do
       end
 
       context "when not signed in" do
-        context "enforce_auth_checks_on_uploads feature flag" do
-          context "with flag enabled" do
-            before do
-              stub_feature_flags(enforce_auth_checks_on_uploads: true)
-            end
-
-            context 'when the project has setting enforce_auth_checks_on_uploads true' do
-              before do
-                model.update!(enforce_auth_checks_on_uploads: true)
-              end
-
-              it "responds with status 200" do
-                show_upload
-
-                expect(response).to have_gitlab_http_status(:ok)
-              end
-            end
+        context 'when the project has setting enforce_auth_checks_on_uploads true' do
+          before do
+            model.update!(enforce_auth_checks_on_uploads: true)
+          end
 
-            context 'when the project has setting enforce_auth_checks_on_uploads false' do
-              before do
-                model.update!(enforce_auth_checks_on_uploads: false)
-              end
+          it "responds with status 200" do
+            show_upload
 
-              it "responds with status 200" do
-                show_upload
+            expect(response).to have_gitlab_http_status(:ok)
+          end
+        end
 
-                expect(response).to have_gitlab_http_status(:ok)
-              end
-            end
+        context 'when the project has setting enforce_auth_checks_on_uploads false' do
+          before do
+            model.update!(enforce_auth_checks_on_uploads: false)
           end
 
-          context "with flag disabled" do
-            before do
-              stub_feature_flags(enforce_auth_checks_on_uploads: false)
-            end
+          it "responds with status 200" do
+            show_upload
 
-            it "responds with status 200" do
-              show_upload
-
-              expect(response).to have_gitlab_http_status(:ok)
-            end
+            expect(response).to have_gitlab_http_status(:ok)
           end
         end
       end
@@ -241,41 +181,21 @@ RSpec.describe Projects::UploadsController do
         end
 
         context "when the user doesn't have access to the model" do
-          context "enforce_auth_checks_on_uploads feature flag" do
-            context "with flag enabled" do
-              before do
-                stub_feature_flags(enforce_auth_checks_on_uploads: true)
-              end
-
-              context 'when the project has setting enforce_auth_checks_on_uploads true' do
-                before do
-                  model.update!(enforce_auth_checks_on_uploads: true)
-                end
-
-                it "responds with status 200" do
-                  show_upload
-
-                  expect(response).to have_gitlab_http_status(:ok)
-                end
-              end
-
-              context 'when the project has setting enforce_auth_checks_on_uploads false' do
-                before do
-                  model.update!(enforce_auth_checks_on_uploads: false)
-                end
-
-                it "responds with status 200" do
-                  show_upload
-
-                  expect(response).to have_gitlab_http_status(:ok)
-                end
-              end
+          context 'when the project has setting enforce_auth_checks_on_uploads true' do
+            before do
+              model.update!(enforce_auth_checks_on_uploads: true)
+            end
+
+            it "responds with status 200" do
+              show_upload
+
+              expect(response).to have_gitlab_http_status(:ok)
             end
           end
 
-          context "with flag disabled" do
+          context 'when the project has setting enforce_auth_checks_on_uploads false' do
             before do
-              stub_feature_flags(enforce_auth_checks_on_uploads: false)
+              model.update!(enforce_auth_checks_on_uploads: false)
             end
 
             it "responds with status 200" do