Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 42 deletions

diff --git a/spec/requests/api/ci/pipelines_spec.rb b/spec/requests/api/ci/pipelines_spec.rb
index 869b0ec9dca..3544a6dd72a 100644
--- a/spec/requests/api/ci/pipelines_spec.rb
+++ b/spec/requests/api/ci/pipelines_spec.rb
@@ -43,19 +43,6 @@ RSpec.describe API::Ci::Pipelines, feature_category: :continuous_integration do
 
           expect(json_response.first.keys).to contain_exactly(*%w[id iid project_id sha ref status web_url created_at updated_at source name])
         end
-
-        context 'when pipeline_name_in_api feature flag is off' do
-          before do
-            stub_feature_flags(pipeline_name_in_api: false)
-          end
-
-          it 'does not include pipeline name in response and ignores name parameter' do
-            get api("/projects/#{project.id}/pipelines", user), params: { name: 'Chatops pipeline' }
-
-            expect(json_response.length).to eq(1)
-            expect(json_response.first.keys).not_to include('name')
-          end
-        end
       end
 
       it 'avoids N+1 queries' do
@@ -894,19 +881,6 @@ RSpec.describe API::Ci::Pipelines, feature_category: :continuous_integration do
           expect(json_response["coverage"]).to eq('30.00')
         end
       end
-
-      context 'with pipeline_name_in_api disabled' do
-        before do
-          stub_feature_flags(pipeline_name_in_api: false)
-        end
-
-        it 'does not return name', :aggregate_failures do
-          get api("/projects/#{project.id}/pipelines/#{pipeline.id}", user)
-
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(json_response.keys).not_to include('name')
-        end
-      end
     end
 
     context 'unauthorized user' do
@@ -971,19 +945,6 @@ RSpec.describe API::Ci::Pipelines, feature_category: :continuous_integration do
           expect(json_response['sha']).to eq(second_branch.target)
         end
       end
-
-      context 'with pipeline_name_in_api disabled' do
-        before do
-          stub_feature_flags(pipeline_name_in_api: false)
-        end
-
-        it 'does not return name', :aggregate_failures do
-          get api("/projects/#{project.id}/pipelines/latest", user)
-
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(json_response.keys).not_to include('name')
-        end
-      end
     end
 
     context 'unauthorized user' do
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 702c8885155..4edcd66e91a 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -2,15 +2,14 @@
 
 require "spec_helper"
 
-RSpec.describe API::MergeRequests, :aggregate_failures, feature_category: :source_code_management,
-  quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/418757' do
+RSpec.describe API::MergeRequests, :aggregate_failures, feature_category: :source_code_management do
   include ProjectForksHelper
 
   let_it_be(:base_time) { Time.now }
   let_it_be(:user)  { create(:user) }
   let_it_be(:user2) { create(:user) }
   let_it_be(:admin) { create(:user, :admin) }
-  let_it_be(:project) { create(:project, :public, :repository, creator: user, namespace: user.namespace, only_allow_merge_if_pipeline_succeeds: false) }
+  let_it_be_with_refind(:project) { create(:project, :public, :repository, creator: user, namespace: user.namespace, only_allow_merge_if_pipeline_succeeds: false) }
 
   let(:milestone1) { create(:milestone, title: '0.9', project: project) }
   let(:milestone) { create(:milestone, title: '1.0.0', project: project) }