Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
556c0d7f
Commit
556c0d7f
authored
May 11, 2020
by
David O'Regan
Committed by
Illya Klymov
May 11, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Missing space on system notes
parent
f6c40a9e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
app/assets/javascripts/notes/components/note_header.vue
app/assets/javascripts/notes/components/note_header.vue
+4
-4
app/assets/javascripts/notes/components/noteable_note.vue
app/assets/javascripts/notes/components/noteable_note.vue
+1
-1
app/assets/javascripts/vue_shared/components/notes/system_note.vue
...s/javascripts/vue_shared/components/notes/system_note.vue
+1
-1
changelogs/unreleased/217310.yml
changelogs/unreleased/217310.yml
+5
-0
No files found.
app/assets/javascripts/notes/components/note_header.vue
View file @
556c0d7f
...
...
@@ -170,17 +170,17 @@ export default {
</span>
</
template
>
<span
v-else
>
{{ __('A deleted user') }}
</span>
<span
class=
"note-headline-light note-headline-meta d-inline-flex align-items-center"
>
<span
class=
"note-headline-light note-headline-meta d-
sm-
inline-flex align-items-center"
>
<span
class=
"system-note-message"
>
<slot></slot>
</span>
<
template
v-if=
"createdAt"
>
<span
ref=
"actionText"
class=
"system-note-separator"
>
<span
ref=
"actionText"
class=
"system-note-separator
ml-1
"
>
<template
v-if=
"actionText"
>
{{
actionText
}}
</
template
>
</span>
<a
v-if=
"noteTimestampLink"
ref=
"noteTimestampLink"
:href=
"noteTimestampLink"
class=
"note-timestamp system-note-separator"
class=
"note-timestamp system-note-separator
mr-1
"
@
click=
"updateTargetNoteHash"
>
<time-ago-tooltip
:time=
"createdAt"
tooltip-placement=
"bottom"
/>
...
...
@@ -194,7 +194,7 @@ export default {
name=
"eye-slash"
:size=
"14"
:title=
"__('Private comments are accessible by internal staff only')"
class=
"m
l
-1 gl-text-gray-800"
class=
"m
x
-1 gl-text-gray-800"
/>
<slot
name=
"extra-controls"
></slot>
<i
...
...
app/assets/javascripts/notes/components/noteable_note.vue
View file @
556c0d7f
...
...
@@ -264,7 +264,7 @@ export default {
>
<slot
slot=
"note-header-info"
name=
"note-header-info"
></slot>
<span
v-if=
"commit"
v-html=
"actionText"
></span>
<span
v-else
class=
"d-none d-sm-inline
mr-1
"
>
·
</span>
<span
v-else
class=
"d-none d-sm-inline"
>
·
</span>
</note-header>
<note-actions
:author-id=
"author.id"
...
...
app/assets/javascripts/vue_shared/components/notes/system_note.vue
View file @
556c0d7f
...
...
@@ -107,7 +107,7 @@ export default {
<span
v-html=
"actionTextHtml"
></span>
<template
v-if=
"canSeeDescriptionVersion"
slot=
"extra-controls"
>
·
<button
type=
"button"
class=
"btn-blank btn-link"
@
click=
"toggleDescriptionVersion"
>
<button
type=
"button"
class=
"btn-blank btn-link
ml-1
"
@
click=
"toggleDescriptionVersion"
>
{{
__
(
'
Compare with previous version
'
)
}}
<icon
:name=
"descriptionVersionToggleIcon"
:size=
"12"
class=
"append-left-5"
/>
</button>
...
...
changelogs/unreleased/217310.yml
0 → 100644
View file @
556c0d7f
---
title
:
Fix missing space on system notes
merge_request
:
31598
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment