Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 2 deletions

diff --git a/app/assets/javascripts/snippets/components/snippet_blob_actions_edit.vue b/app/assets/javascripts/snippets/components/snippet_blob_actions_edit.vue
index 260ee496df0..59f7c8d8d97 100644
--- a/app/assets/javascripts/snippets/components/snippet_blob_actions_edit.vue
+++ b/app/assets/javascripts/snippets/components/snippet_blob_actions_edit.vue
@@ -2,7 +2,7 @@
 import { GlButton, GlFormGroup } from '@gitlab/ui';
 import { cloneDeep } from 'lodash';
 import { s__, sprintf } from '~/locale';
-import { SNIPPET_MAX_BLOBS } from '../constants';
+import { SNIPPET_MAX_BLOBS, SNIPPET_LIMITATIONS } from '../constants';
 import { createBlob, decorateBlob, diffAll } from '../utils/blob';
 import SnippetBlobEdit from './snippet_blob_edit.vue';
 
@@ -50,6 +50,11 @@ export default {
         total: SNIPPET_MAX_BLOBS,
       });
     },
+    limitationText() {
+      return sprintf(SNIPPET_LIMITATIONS, {
+        total: SNIPPET_MAX_BLOBS,
+      });
+    },
     canDelete() {
       return this.count > 1;
     },
@@ -159,5 +164,8 @@ export default {
       @click="addBlob"
       >{{ addLabel }}</gl-button
     >
+    <p v-if="!canAdd" data-testid="limitations_text" class="gl-text-secondary">
+      {{ limitationText }}
+    </p>
   </div>
 </template>
diff --git a/app/assets/javascripts/snippets/constants.js b/app/assets/javascripts/snippets/constants.js
index 84a940ed1f8..2d2eede9137 100644
--- a/app/assets/javascripts/snippets/constants.js
+++ b/app/assets/javascripts/snippets/constants.js
@@ -1,4 +1,4 @@
-import { __ } from '~/locale';
+import { __, s__ } from '~/locale';
 import {
   VISIBILITY_LEVEL_PRIVATE_STRING,
   VISIBILITY_LEVEL_INTERNAL_STRING,
@@ -41,3 +41,5 @@ export const SNIPPET_LEVELS_RESTRICTED = __(
 export const SNIPPET_LEVELS_DISABLED = __(
   'Visibility settings have been disabled by the administrator.',
 );
+
+export const SNIPPET_LIMITATIONS = s__('Snippets|Snippets are limited to %{total} files.');