1 files changed, 8 insertions, 15 deletions

diff --git a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_modal.vue b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_modal.vue
index 2f595342a31..967125c7b0a 100644
--- a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_modal.vue
+++ b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_modal.vue
@@ -17,7 +17,6 @@ import {
 import { getCookie, setCookie } from '~/lib/utils/common_utils';
 import { __ } from '~/locale';
 import Tracking from '~/tracking';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 import {
   allEnvironments,
@@ -65,7 +64,7 @@ export default {
     GlModal,
     GlSprintf,
   },
-  mixins: [glFeatureFlagsMixin(), trackingMixin],
+  mixins: [trackingMixin],
   inject: [
     'awsLogoSvgPath',
     'awsTipCommandsLink',
@@ -75,7 +74,6 @@ export default {
     'environmentScopeLink',
     'isProtectedByDefault',
     'maskedEnvironmentVariablesLink',
-    'maskableRawRegex',
     'maskableRegex',
     'protectedEnvironmentVariablesLink',
   ],
@@ -123,7 +121,7 @@ export default {
   },
   computed: {
     canMask() {
-      const regex = RegExp(this.useRawMaskableRegexp ? this.maskableRawRegex : this.maskableRegex);
+      const regex = RegExp(this.maskableRegex);
       return regex.test(this.variable.value);
     },
     canSubmit() {
@@ -136,17 +134,11 @@ export default {
     displayMaskedError() {
       return !this.canMask && this.variable.masked;
     },
-    isUsingRawRegexFlag() {
-      return this.glFeatures.ciRemoveCharacterLimitationRawMaskedVar;
-    },
     isEditing() {
       return this.mode === EDIT_VARIABLE_ACTION;
     },
     isExpanded() {
-      return !this.isRaw;
-    },
-    isRaw() {
-      return this.variable.raw;
+      return !this.variable.raw;
     },
     isTipVisible() {
       return !this.isTipDismissed && AWS_TOKEN_CONSTANTS.includes(this.variable.key);
@@ -182,9 +174,6 @@ export default {
 
       return true;
     },
-    useRawMaskableRegexp() {
-      return this.isRaw && this.isUsingRawRegexFlag;
-    },
     variableValidationFeedback() {
       return `${this.tokenValidationFeedback} ${this.maskedFeedback}`;
     },
@@ -326,7 +315,11 @@ export default {
           class="gl-font-monospace!"
           spellcheck="false"
         />
-        <p v-if="isRaw" class="gl-mt-2 gl-mb-0 text-secondary" data-testid="raw-variable-tip">
+        <p
+          v-if="variable.raw"
+          class="gl-mt-2 gl-mb-0 text-secondary"
+          data-testid="raw-variable-tip"
+        >
           {{ __('Variable value will be evaluated as raw string.') }}
         </p>
       </gl-form-group>