Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 11 deletions

diff --git a/app/assets/javascripts/badges/components/badge_form.vue b/app/assets/javascripts/badges/components/badge_form.vue
index c95c90d5daf..5bc29750635 100644
--- a/app/assets/javascripts/badges/components/badge_form.vue
+++ b/app/assets/javascripts/badges/components/badge_form.vue
@@ -6,7 +6,6 @@ import SafeHtml from '~/vue_shared/directives/safe_html';
 import { createAlert, VARIANT_INFO } from '~/flash';
 import { s__, sprintf } from '~/locale';
 import createEmptyBadge from '../empty_badge';
-import { PLACEHOLDERS } from '../constants';
 import Badge from './badge.vue';
 
 const badgePreviewDelayInMilliseconds = 1500;
@@ -51,9 +50,9 @@ export default {
       return this.badgeInAddForm;
     },
     helpText() {
-      const placeholders = PLACEHOLDERS.map((placeholder) => `<code>%{${placeholder}}</code>`).join(
-        ', ',
-      );
+      const placeholders = ['project_path', 'project_id', 'default_branch', 'commit_sha']
+        .map((placeholder) => `<code>%{${placeholder}}</code>`)
+        .join(', ');
       return sprintf(
         s__('Badges|Supported %{docsLinkStart}variables%{docsLinkEnd}: %{placeholders}'),
         {
diff --git a/app/assets/javascripts/badges/constants.js b/app/assets/javascripts/badges/constants.js
index 6819a20fe8f..8fbe3db5ef1 100644
--- a/app/assets/javascripts/badges/constants.js
+++ b/app/assets/javascripts/badges/constants.js
@@ -1,9 +1,2 @@
 export const GROUP_BADGE = 'group';
 export const PROJECT_BADGE = 'project';
-export const PLACEHOLDERS = [
-  'project_path',
-  'project_name',
-  'project_id',
-  'default_branch',
-  'commit_sha',
-];