Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 12 deletions

diff --git a/spec/requests/api/ci/runner/jobs_artifacts_spec.rb b/spec/requests/api/ci/runner/jobs_artifacts_spec.rb
index 3b1b68d00bb..2e0be23ba90 100644
--- a/spec/requests/api/ci/runner/jobs_artifacts_spec.rb
+++ b/spec/requests/api/ci/runner/jobs_artifacts_spec.rb
@@ -181,18 +181,6 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_catego
                   expect(json_response['RemoteObject']['SkipDelete']).to eq(true)
                   expect(json_response['MaximumSize']).not_to be_nil
                 end
-
-                context 'when ci_artifacts_upload_to_final_location flag is disabled' do
-                  before do
-                    stub_feature_flags(ci_artifacts_upload_to_final_location: false)
-                  end
-
-                  it 'does not skip delete' do
-                    subject
-
-                    expect(json_response['RemoteObject']['SkipDelete']).to eq(false)
-                  end
-                end
               end
 
               context 'when direct upload is disabled' do