diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-03 18:09:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-03 18:09:42 +0300 |
| commit | a99d0fa6922be88307b1c80330a257c55c5d8270 (patch) | |
| tree | 948c3d8d846bfa5ef2fd17c84cee467d678e6f1b /app/assets/javascripts/notes | |
| parent | 077b0a79d52753d020280ed8d58f97f8207b42de (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/discussion_notes.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_note.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_notes.vue b/app/assets/javascripts/notes/components/discussion_notes.vue index 2dbc9b10836..00ed7f0291b 100644 --- a/app/assets/javascripts/notes/components/discussion_notes.vue +++ b/app/assets/javascripts/notes/components/discussion_notes.vue @@ -142,7 +142,7 @@ export default { :edited-at="discussion.resolved_at" :edited-by="discussion.resolved_by" :action-text="resolvedText" - class-name="discussion-headline-light js-discussion-headline discussion-resolved-text gl-mb-2 gl-ml-3" + class-name="discussion-headline-light js-discussion-headline discussion-resolved-text gl-mb-2" /> </template> <template #avatar-badge> diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index 86aa87b9add..00007fde96e 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -424,7 +424,7 @@ export default { </gl-sprintf> </div> - <div v-if="isMRDiffView" class="gl-float-left gl-mt-2"> + <div v-if="isMRDiffView" class="timeline-avatar gl-float-left gl-pt-2"> <gl-avatar-link :href="author.path"> <gl-avatar :src="author.avatar_url" |