Add latest changes from gitlab-org/gitlab@master

2 files changed, 41 insertions, 1 deletions

diff --git a/app/assets/javascripts/snippets/components/app.vue b/app/assets/javascripts/snippets/components/app.vue
index bd2cb8e4595..7a2145a800c 100644
--- a/app/assets/javascripts/snippets/components/app.vue
+++ b/app/assets/javascripts/snippets/components/app.vue
@@ -1,11 +1,13 @@
 <script>
 import GetSnippetQuery from '../queries/snippet.query.graphql';
 import SnippetHeader from './snippet_header.vue';
+import SnippetTitle from './snippet_title.vue';
 import { GlLoadingIcon } from '@gitlab/ui';
 
 export default {
   components: {
     SnippetHeader,
+    SnippetTitle,
     GlLoadingIcon,
   },
   apollo: {
@@ -45,6 +47,9 @@ export default {
       :size="2"
       class="loading-animation prepend-top-20 append-bottom-20"
     />
-    <snippet-header v-else :snippet="snippet" />
+    <template v-else>
+      <snippet-header :snippet="snippet" />
+      <snippet-title :snippet="snippet" />
+    </template>
   </div>
 </template>
diff --git a/app/assets/javascripts/snippets/components/snippet_title.vue b/app/assets/javascripts/snippets/components/snippet_title.vue
new file mode 100644
index 00000000000..fc8a9b4a390
--- /dev/null
+++ b/app/assets/javascripts/snippets/components/snippet_title.vue
@@ -0,0 +1,35 @@
+<script>
+import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+import { GlSprintf } from '@gitlab/ui';
+
+export default {
+  components: {
+    TimeAgoTooltip,
+    GlSprintf,
+  },
+  props: {
+    snippet: {
+      type: Object,
+      required: true,
+    },
+  },
+};
+</script>
+<template>
+  <div class="snippet-header limited-header-width">
+    <h2 class="snippet-title prepend-top-0 mb-3" data-qa-selector="snippet_title">
+      {{ snippet.title }}
+    </h2>
+    <div v-if="snippet.description" class="description" data-qa-selector="snippet_description">
+      <div class="md">{{ snippet.description }}</div>
+    </div>
+
+    <small v-if="snippet.updatedAt !== snippet.createdAt" class="edited-text">
+      <gl-sprintf message="Edited %{timeago}">
+        <template #timeago>
+          <time-ago-tooltip :time="snippet.updatedAt" tooltip-placement="bottom" />
+        </template>
+      </gl-sprintf>
+    </small>
+  </div>
+</template>