Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 7 deletions

diff --git a/spec/frontend/vue_mr_widget/mr_widget_options_spec.js b/spec/frontend/vue_mr_widget/mr_widget_options_spec.js
index 8c642799fb8..872dcd2af7f 100644
--- a/spec/frontend/vue_mr_widget/mr_widget_options_spec.js
+++ b/spec/frontend/vue_mr_widget/mr_widget_options_spec.js
@@ -825,14 +825,11 @@ describe('MrWidgetOptions', () => {
 
   describe('security widget', () => {
     describe.each`
-      context                             | hasPipeline | isFlagEnabled | shouldRender
-      ${'has pipeline and flag enabled'}  | ${true}     | ${true}       | ${true}
-      ${'has pipeline and flag disabled'} | ${true}     | ${false}      | ${false}
-      ${'no pipeline and flag enabled'}   | ${false}    | ${true}       | ${false}
-    `('given $context', ({ hasPipeline, isFlagEnabled, shouldRender }) => {
+      context                  | hasPipeline | shouldRender
+      ${'there is a pipeline'} | ${true}     | ${true}
+      ${'no pipeline'}         | ${false}    | ${false}
+    `('given $context', ({ hasPipeline, shouldRender }) => {
       beforeEach(() => {
-        gon.features.coreSecurityMrWidget = isFlagEnabled;
-
         const mrData = {
           ...mockData,
           ...(hasPipeline ? {} : { pipeline: null }),