Add latest changes from gitlab-org/gitlab@master

2 files changed, 72 insertions, 0 deletions

diff --git a/app/assets/javascripts/issuable/components/hidden_badge.vue b/app/assets/javascripts/issuable/components/hidden_badge.vue
new file mode 100644
index 00000000000..a80dc2f62d4
--- /dev/null
+++ b/app/assets/javascripts/issuable/components/hidden_badge.vue
@@ -0,0 +1,36 @@
+<script>
+import { GlBadge, GlIcon, GlTooltipDirective } from '@gitlab/ui';
+import { issuableTypeText } from '~/issues/constants';
+import { __, sprintf } from '~/locale';
+
+export default {
+  components: {
+    GlBadge,
+    GlIcon,
+  },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
+  props: {
+    issuableType: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+  computed: {
+    title() {
+      return sprintf(__('This %{issuable} is hidden because its author has been banned.'), {
+        issuable: issuableTypeText[this.issuableType],
+      });
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-badge v-gl-tooltip :title="title" variant="warning">
+    <gl-icon name="spam" />
+    <span class="gl-sr-only">{{ __('Hidden') }}</span>
+  </gl-badge>
+</template>
diff --git a/app/assets/javascripts/issuable/components/locked_badge.vue b/app/assets/javascripts/issuable/components/locked_badge.vue
new file mode 100644
index 00000000000..f97ac888417
--- /dev/null
+++ b/app/assets/javascripts/issuable/components/locked_badge.vue
@@ -0,0 +1,36 @@
+<script>
+import { GlBadge, GlIcon, GlTooltipDirective } from '@gitlab/ui';
+import { issuableTypeText } from '~/issues/constants';
+import { __, sprintf } from '~/locale';
+
+export default {
+  components: {
+    GlBadge,
+    GlIcon,
+  },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
+  props: {
+    issuableType: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+  computed: {
+    title() {
+      return sprintf(__('This %{issuable} is locked. Only project members can comment.'), {
+        issuable: issuableTypeText[this.issuableType],
+      });
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-badge v-gl-tooltip :title="title" variant="warning">
+    <gl-icon name="lock" />
+    <span class="gl-sr-only">{{ __('Locked') }}</span>
+  </gl-badge>
+</template>