diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-01 09:34:16 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-03-01 09:34:16 +0000 |
| commit | 37541114770f9229acb29e798494a063e1b40d04 (patch) | |
| tree | fd78ae442d0bd628a835525b2d82d156eaea3c40 /app/assets/javascripts/notes/components | |
| parent | d860ab195afbf11118564e6399cd59a8bbd9d622 (diff) | |
| download | gitlab-ce-37541114770f9229acb29e798494a063e1b40d04.tar.gz | |
Move EE differences in CE diff files into CE
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9974, https://gitlab.com/gitlab-org/gitlab-ee/issues/9973, https://gitlab.com/gitlab-org/gitlab-ee/issues/9969
Diffstat (limited to 'app/assets/javascripts/notes/components')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_header.vue | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue index 7b39901024d..68b753a4abf 100644 --- a/app/assets/javascripts/notes/components/note_header.vue +++ b/app/assets/javascripts/notes/components/note_header.vue @@ -69,7 +69,7 @@ export default { type="button" @click="handleToggle" > - <i :class="toggleChevronClass" class="fa" aria-hidden="true"> </i> + <i :class="toggleChevronClass" class="fa" aria-hidden="true"></i> {{ __('Toggle discussion') }} </button> </div> @@ -81,19 +81,18 @@ export default { :data-user-id="author.id" :data-username="author.username" > + <slot name="note-header-info"></slot> <span class="note-header-author-name">{{ author.name }}</span> <span v-if="author.status_tooltip_html" v-html="author.status_tooltip_html"></span> - <span class="note-headline-light"> @{{ author.username }} </span> + <span class="note-headline-light">@{{ author.username }}</span> </a> - <span v-else> {{ __('A deleted user') }} </span> + <span v-else>{{ __('A deleted user') }}</span> <span class="note-headline-light"> <span class="note-headline-meta"> <span class="system-note-message"> <slot></slot> </span> <template v-if="createdAt"> <span class="system-note-separator"> - <template v-if="actionText"> - {{ actionText }} - </template> + <template v-if="actionText">{{ actionText }}</template> </span> <a :href="noteTimestampLink" @@ -107,8 +106,7 @@ export default { class="fa fa-spinner fa-spin editing-spinner" aria-label="Comment is being updated" aria-hidden="true" - > - </i> + ></i> </span> </span> </div> |