Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 3 insertions, 20 deletions

diff --git a/spec/features/groups/settings/repository_spec.rb b/spec/features/groups/settings/repository_spec.rb
index f6b8bbdd35f..cd7dcbdb28d 100644
--- a/spec/features/groups/settings/repository_spec.rb
+++ b/spec/features/groups/settings/repository_spec.rb
@@ -23,26 +23,9 @@ RSpec.describe 'Group Repository settings', :js do
       stub_container_registry_config(enabled: true)
     end
 
-    context 'when ajax deploy tokens is enabled' do
-      before do
-        stub_feature_flags(ajax_new_deploy_token: true)
-      end
-
-      it_behaves_like 'a deploy token in settings' do
-        let(:entity_type) { 'group' }
-        let(:page_path) { group_settings_repository_path(group) }
-      end
-    end
-
-    context 'when ajax deploy tokens is disabled' do
-      before do
-        stub_feature_flags(ajax_new_deploy_token: false)
-      end
-
-      it_behaves_like 'a deploy token in settings' do
-        let(:entity_type) { 'group' }
-        let(:page_path) { group_settings_repository_path(group) }
-      end
+    it_behaves_like 'a deploy token in settings' do
+      let(:entity_type) { 'group' }
+      let(:page_path) { group_settings_repository_path(group) }
     end
   end