Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 12 deletions

diff --git a/spec/views/admin/application_settings/general.html.haml_spec.rb b/spec/views/admin/application_settings/general.html.haml_spec.rb
index a8c7bec36e3..f229fd2dcdc 100644
--- a/spec/views/admin/application_settings/general.html.haml_spec.rb
+++ b/spec/views/admin/application_settings/general.html.haml_spec.rb
@@ -75,18 +75,6 @@ RSpec.describe 'admin/application_settings/general.html.haml' do
 
       expect(rendered).to have_css('#js-jira_connect-settings')
     end
-
-    context 'when the jira_connect_oauth_self_managed_setting feature flag is disabled' do
-      before do
-        stub_feature_flags(jira_connect_oauth_self_managed_setting: false)
-      end
-
-      it 'does not show the jira connect settings section' do
-        render
-
-        expect(rendered).not_to have_css('#js-jira_connect-settings')
-      end
-    end
   end
 
   describe 'sign-up restrictions' do