Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

2 files changed, 6 insertions, 3 deletions

diff --git a/app/assets/javascripts/feature_flags/components/feature_flags.vue b/app/assets/javascripts/feature_flags/components/feature_flags.vue
index 115d68de5c9..9aa1accb0f2 100644
--- a/app/assets/javascripts/feature_flags/components/feature_flags.vue
+++ b/app/assets/javascripts/feature_flags/components/feature_flags.vue
@@ -35,8 +35,9 @@ export default {
   inject: {
     newUserListPath: { default: '' },
     newFeatureFlagPath: { default: '' },
-    canUserConfigure: { required: true },
-    featureFlagsLimitExceeded: { required: true },
+    canUserConfigure: {},
+    featureFlagsLimitExceeded: {},
+    featureFlagsLimit: {},
   },
   data() {
     const scope = getParameterByName('scope') || SCOPES.FEATURE_FLAG_SCOPE;
diff --git a/app/assets/javascripts/feature_flags/index.js b/app/assets/javascripts/feature_flags/index.js
index a92805d5d85..d2371a2aa8b 100644
--- a/app/assets/javascripts/feature_flags/index.js
+++ b/app/assets/javascripts/feature_flags/index.js
@@ -24,6 +24,7 @@ export default () => {
     newFeatureFlagPath,
     newUserListPath,
     featureFlagsLimitExceeded,
+    featureFlagsLimit,
   } = el.dataset;
 
   return new Vue({
@@ -40,7 +41,8 @@ export default () => {
       canUserConfigure: canUserAdminFeatureFlag !== undefined,
       newFeatureFlagPath,
       newUserListPath,
-      featureFlagsLimitExceeded,
+      featureFlagsLimitExceeded: featureFlagsLimitExceeded !== undefined,
+      featureFlagsLimit,
     },
     render(createElement) {
       return createElement(FeatureFlagsComponent);