Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 12 deletions

diff --git a/spec/finders/ci/pipelines_finder_spec.rb b/spec/finders/ci/pipelines_finder_spec.rb
index 8773fbccdfc..e6984d2f0bc 100644
--- a/spec/finders/ci/pipelines_finder_spec.rb
+++ b/spec/finders/ci/pipelines_finder_spec.rb
@@ -259,16 +259,6 @@ RSpec.describe Ci::PipelinesFinder do
           is_expected.to be_empty
         end
       end
-
-      context 'when pipeline_name_search feature flag is off' do
-        before do
-          stub_feature_flags(pipeline_name_search: false)
-        end
-
-        it 'ignores name parameter' do
-          is_expected.to contain_exactly(pipeline, pipeline_other)
-        end
-      end
     end
 
     describe 'ordering' do
diff --git a/spec/models/integrations/jira_spec.rb b/spec/models/integrations/jira_spec.rb
index 2a3a3ec7f09..36af9c2daf7 100644
--- a/spec/models/integrations/jira_spec.rb
+++ b/spec/models/integrations/jira_spec.rb
@@ -228,9 +228,19 @@ RSpec.describe Integrations::Jira, feature_category: :integrations do
       end
     end
 
-    context 'when project_level? is false' do
+    context 'when instance_level? is false' do
       before do
-        allow(integration).to receive(:project_level?).and_return(false)
+        allow(integration).to receive(:instance_level?).and_return(false)
+      end
+
+      it 'includes SECTION_TYPE_JIRA_ISSUES' do
+        expect(sections).to include(described_class::SECTION_TYPE_JIRA_ISSUES)
+      end
+    end
+
+    context 'when instance_level? is true' do
+      before do
+        allow(integration).to receive(:instance_level?).and_return(true)
       end
 
       it 'does not include SECTION_TYPE_JIRA_ISSUES' do