Add latest changes from gitlab-org/gitlab@master

2 files changed, 40 insertions, 0 deletions

diff --git a/app/assets/javascripts/issue_show/components/issuable_header_warnings.vue b/app/assets/javascripts/issue_show/components/issuable_header_warnings.vue
new file mode 100644
index 00000000000..b6816be9eb8
--- /dev/null
+++ b/app/assets/javascripts/issue_show/components/issuable_header_warnings.vue
@@ -0,0 +1,28 @@
+<script>
+import { mapState } from 'vuex';
+import Icon from '~/vue_shared/components/icon.vue';
+
+export default {
+  components: {
+    Icon,
+  },
+  computed: {
+    ...mapState({
+      confidential: ({ noteableData }) => noteableData.confidential,
+      dicussionLocked: ({ noteableData }) => noteableData.discussion_locked,
+    }),
+  },
+};
+</script>
+
+<template>
+  <div class="gl-display-inline-block">
+    <div v-if="confidential" class="issuable-warning-icon inline">
+      <icon class="icon" name="eye-slash" data-testid="confidential" />
+    </div>
+
+    <div v-if="dicussionLocked" class="issuable-warning-icon inline">
+      <icon class="icon" name="lock" data-testid="locked" />
+    </div>
+  </div>
+</template>
diff --git a/app/assets/javascripts/issue_show/index.js b/app/assets/javascripts/issue_show/index.js
index e170d338408..fe4ff133145 100644
--- a/app/assets/javascripts/issue_show/index.js
+++ b/app/assets/javascripts/issue_show/index.js
@@ -1,6 +1,8 @@
 import Vue from 'vue';
 import issuableApp from './components/app.vue';
+import IssuableHeaderWarnings from './components/issuable_header_warnings.vue';
 import { parseIssuableData } from './utils/parse_data';
+import { store } from '~/notes/stores';
 
 export default function initIssueableApp() {
   return new Vue({
@@ -15,3 +17,13 @@ export default function initIssueableApp() {
     },
   });
 }
+
+export function issuableHeaderWarnings() {
+  return new Vue({
+    el: document.getElementById('js-issuable-header-warnings'),
+    store,
+    render(createElement) {
+      return createElement(IssuableHeaderWarnings);
+    },
+  });
+}