diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 18:08:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 18:08:03 +0300 |
commit | ccf37fd3eca15cd5f55c1eba3b28d2798808d357 (patch) | |
tree | 925471acb29c7cc080a522b1d2db6b06e55616dd /app/assets/javascripts/snippets | |
parent | 79d62647bcfad69d7272020acb7d8be5ee5df003 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/snippets')
-rw-r--r-- | app/assets/javascripts/snippets/components/app.vue | 7 | ||||
-rw-r--r-- | app/assets/javascripts/snippets/components/snippet_title.vue | 35 |
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> |