Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 7 deletions

diff --git a/spec/features/issues/incident_issue_spec.rb b/spec/features/issues/incident_issue_spec.rb
index 57dfb370bf4..d004ee85dd8 100644
--- a/spec/features/issues/incident_issue_spec.rb
+++ b/spec/features/issues/incident_issue_spec.rb
@@ -3,17 +3,14 @@
 require 'spec_helper'
 
 RSpec.describe 'Incident Detail', :js do
-  let(:user)      { create(:user) }
-  let(:project)   { create(:project, :public) }
-  let(:incident)  { create(:issue, project: project, author: user, issue_type: 'incident', description: 'hello') }
-
   context 'when user displays the incident' do
-    before do
+    it 'shows the incident tabs' do
+      project = create(:project, :public)
+      incident = create(:incident, project: project, description: 'hello')
+
       visit project_issue_path(project, incident)
       wait_for_requests
-    end
 
-    it 'shows the incident tabs' do
       page.within('.issuable-details') do
         incident_tabs = find('[data-testid="incident-tabs"]')
 
diff --git a/spec/features/merge_request/user_sees_pipelines_spec.rb b/spec/features/merge_request/user_sees_pipelines_spec.rb
index 5d41e49c478..8e15ba6cf8d 100644
--- a/spec/features/merge_request/user_sees_pipelines_spec.rb
+++ b/spec/features/merge_request/user_sees_pipelines_spec.rb
@@ -123,6 +123,10 @@ RSpec.describe 'Merge request > User sees pipelines', :js do
     context 'when actor is a developer in parent project' do
       let(:actor) { developer_in_parent }
 
+      before do
+        stub_feature_flags(ci_disallow_to_create_merge_request_pipelines_in_target_project: false)
+      end
+
       it 'creates a pipeline in the parent project when user proceeds with the warning' do
         visit project_merge_request_path(parent_project, merge_request)