Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 2 deletions

diff --git a/app/assets/javascripts/notes/components/discussion_locked_widget.vue b/app/assets/javascripts/notes/components/discussion_locked_widget.vue
index 53f509185a8..8636984c6af 100644
--- a/app/assets/javascripts/notes/components/discussion_locked_widget.vue
+++ b/app/assets/javascripts/notes/components/discussion_locked_widget.vue
@@ -12,6 +12,9 @@ export default {
   },
   mixins: [Issuable, issuableStateMixin],
   computed: {
+    projectArchivedWarning() {
+      return __('This project is archived and cannot be commented on.');
+    },
     lockedIssueWarning() {
       return sprintf(
         __('This %{issuableDisplayName} is locked. Only project members can comment.'),
@@ -26,9 +29,15 @@ export default {
   <div class="disabled-comment text-center">
     <span class="issuable-note-warning inline">
       <icon :size="16" name="lock" class="icon" />
-      <span>
-        {{ lockedIssueWarning }}
+      <span v-if="isProjectArchived">
+        {{ projectArchivedWarning }}
+        <gl-link :href="archivedProjectDocsPath" target="_blank" class="learn-more">
+          {{ __('Learn more') }}
+        </gl-link>
+      </span>
 
+      <span v-else>
+        {{ lockedIssueWarning }}
         <gl-link :href="lockedIssueDocsPath" target="_blank" class="learn-more">
           {{ __('Learn more') }}
         </gl-link>
diff --git a/app/assets/javascripts/notes/mixins/issuable_state.js b/app/assets/javascripts/notes/mixins/issuable_state.js
index d97d9f6850a..0ca8c8c98a3 100644
--- a/app/assets/javascripts/notes/mixins/issuable_state.js
+++ b/app/assets/javascripts/notes/mixins/issuable_state.js
@@ -3,6 +3,12 @@ import { mapGetters } from 'vuex';
 export default {
   computed: {
     ...mapGetters(['getNoteableDataByProp']),
+    isProjectArchived() {
+      return this.getNoteableDataByProp('is_project_archived');
+    },
+    archivedProjectDocsPath() {
+      return this.getNoteableDataByProp('archived_project_docs_path');
+    },
     lockedIssueDocsPath() {
       return this.getNoteableDataByProp('locked_discussion_docs_path');
     },