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
a5f1a1e1
Commit
a5f1a1e1
authored
May 11, 2020
by
Paul Slaughter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch '217310' into 'master'"
This reverts commit
0eb7e145
, reversing changes made to
a84d260e
.
parent
bd75e6ea
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
11 deletions
+6
-11
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
+0
-5
No files found.
app/assets/javascripts/notes/components/note_header.vue
View file @
a5f1a1e1
...
@@ -170,17 +170,17 @@ export default {
...
@@ -170,17 +170,17 @@ export default {
</span>
</span>
</
template
>
</
template
>
<span
v-else
>
{{ __('A deleted user') }}
</span>
<span
v-else
>
{{ __('A deleted user') }}
</span>
<span
class=
"note-headline-light note-headline-meta d-
sm-
inline-flex align-items-center"
>
<span
class=
"note-headline-light note-headline-meta d-inline-flex align-items-center"
>
<span
class=
"system-note-message"
>
<slot></slot>
</span>
<span
class=
"system-note-message"
>
<slot></slot>
</span>
<
template
v-if=
"createdAt"
>
<
template
v-if=
"createdAt"
>
<span
ref=
"actionText"
class=
"system-note-separator
ml-1
"
>
<span
ref=
"actionText"
class=
"system-note-separator"
>
<template
v-if=
"actionText"
>
{{
actionText
}}
</
template
>
<template
v-if=
"actionText"
>
{{
actionText
}}
</
template
>
</span>
</span>
<a
<a
v-if=
"noteTimestampLink"
v-if=
"noteTimestampLink"
ref=
"noteTimestampLink"
ref=
"noteTimestampLink"
:href=
"noteTimestampLink"
:href=
"noteTimestampLink"
class=
"note-timestamp system-note-separator
mr-1
"
class=
"note-timestamp system-note-separator"
@
click=
"updateTargetNoteHash"
@
click=
"updateTargetNoteHash"
>
>
<time-ago-tooltip
:time=
"createdAt"
tooltip-placement=
"bottom"
/>
<time-ago-tooltip
:time=
"createdAt"
tooltip-placement=
"bottom"
/>
...
@@ -194,7 +194,7 @@ export default {
...
@@ -194,7 +194,7 @@ export default {
name=
"eye-slash"
name=
"eye-slash"
:size=
"14"
:size=
"14"
:title=
"__('Private comments are accessible by internal staff only')"
:title=
"__('Private comments are accessible by internal staff only')"
class=
"m
x
-1 gl-text-gray-800"
class=
"m
l
-1 gl-text-gray-800"
/>
/>
<slot
name=
"extra-controls"
></slot>
<slot
name=
"extra-controls"
></slot>
<i
<i
...
...
app/assets/javascripts/notes/components/noteable_note.vue
View file @
a5f1a1e1
...
@@ -264,7 +264,7 @@ export default {
...
@@ -264,7 +264,7 @@ export default {
>
>
<slot
slot=
"note-header-info"
name=
"note-header-info"
></slot>
<slot
slot=
"note-header-info"
name=
"note-header-info"
></slot>
<span
v-if=
"commit"
v-html=
"actionText"
></span>
<span
v-if=
"commit"
v-html=
"actionText"
></span>
<span
v-else
class=
"d-none d-sm-inline"
>
·
</span>
<span
v-else
class=
"d-none d-sm-inline
mr-1
"
>
·
</span>
</note-header>
</note-header>
<note-actions
<note-actions
:author-id=
"author.id"
:author-id=
"author.id"
...
...
app/assets/javascripts/vue_shared/components/notes/system_note.vue
View file @
a5f1a1e1
...
@@ -107,7 +107,7 @@ export default {
...
@@ -107,7 +107,7 @@ export default {
<span
v-html=
"actionTextHtml"
></span>
<span
v-html=
"actionTextHtml"
></span>
<template
v-if=
"canSeeDescriptionVersion"
slot=
"extra-controls"
>
<template
v-if=
"canSeeDescriptionVersion"
slot=
"extra-controls"
>
·
·
<button
type=
"button"
class=
"btn-blank btn-link
ml-1
"
@
click=
"toggleDescriptionVersion"
>
<button
type=
"button"
class=
"btn-blank btn-link"
@
click=
"toggleDescriptionVersion"
>
{{
__
(
'
Compare with previous version
'
)
}}
{{
__
(
'
Compare with previous version
'
)
}}
<icon
:name=
"descriptionVersionToggleIcon"
:size=
"12"
class=
"append-left-5"
/>
<icon
:name=
"descriptionVersionToggleIcon"
:size=
"12"
class=
"append-left-5"
/>
</button>
</button>
...
...
changelogs/unreleased/217310.yml
deleted
100644 → 0
View file @
bd75e6ea
---
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