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
6a10ed3f
Commit
6a10ed3f
authored
May 09, 2018
by
Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add dot to separate system notes content
parent
f667bbce
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
5 deletions
+18
-5
app/assets/javascripts/notes/components/note_header.vue
app/assets/javascripts/notes/components/note_header.vue
+4
-1
app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue
...ts/javascripts/vue_shared/components/time_ago_tooltip.vue
+2
-2
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+4
-0
app/views/shared/notes/_note.html.haml
app/views/shared/notes/_note.html.haml
+3
-2
changelogs/unreleased/jivl-add-dot-system-notes.yml
changelogs/unreleased/jivl-add-dot-system-notes.yml
+5
-0
No files found.
app/assets/javascripts/notes/components/note_header.vue
View file @
6a10ed3f
...
@@ -78,10 +78,13 @@ export default {
...
@@ -78,10 +78,13 @@ export default {
v-html=
"actionTextHtml"
v-html=
"actionTextHtml"
class=
"system-note-message"
>
class=
"system-note-message"
>
</span>
</span>
<span
class=
"system-note-separator"
>
·
</span>
<a
<a
:href=
"noteTimestampLink"
:href=
"noteTimestampLink"
@
click=
"updateTargetNoteHash"
@
click=
"updateTargetNoteHash"
class=
"note-timestamp"
>
class=
"note-timestamp
system-note-separator
"
>
<time-ago-tooltip
<time-ago-tooltip
:time=
"createdAt"
:time=
"createdAt"
tooltip-placement=
"bottom"
tooltip-placement=
"bottom"
...
...
app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue
View file @
6a10ed3f
...
@@ -40,7 +40,7 @@ export default {
...
@@ -40,7 +40,7 @@ export default {
:class=
"cssClass"
:class=
"cssClass"
:title=
"tooltipTitle(time)"
:title=
"tooltipTitle(time)"
:data-placement=
"tooltipPlacement"
:data-placement=
"tooltipPlacement"
data-container=
"body"
>
data-container=
"body"
{{
timeFormated
(
time
)
}}
v-text=
"timeFormated(time)"
>
</time>
</time>
</
template
>
</
template
>
app/assets/stylesheets/pages/notes.scss
View file @
6a10ed3f
...
@@ -459,6 +459,10 @@ ul.notes {
...
@@ -459,6 +459,10 @@ ul.notes {
white-space
:
normal
;
white-space
:
normal
;
}
}
.system-note-separator
{
color
:
$gl-text-color-disabled
;
}
a
:hover
{
a
:hover
{
text-decoration
:
underline
;
text-decoration
:
underline
;
}
}
...
...
app/views/shared/notes/_note.html.haml
View file @
6a10ed3f
...
@@ -41,8 +41,9 @@
...
@@ -41,8 +41,9 @@
-
if
note
.
system
-
if
note
.
system
%span
.system-note-message
%span
.system-note-message
=
markdown_field
(
note
,
:note
)
=
markdown_field
(
note
,
:note
)
%a
{
href:
"##{dom_id(note)}"
}
%span
.system-note-separator
=
time_ago_with_tooltip
(
note
.
created_at
,
placement:
'bottom'
,
html_class:
'note-created-ago'
)
·
%a
.system-note-separator
{
href:
"##{dom_id(note)}"
}=
time_ago_with_tooltip
(
note
.
created_at
,
placement:
'bottom'
,
html_class:
'note-created-ago'
)
-
unless
note
.
system?
-
unless
note
.
system?
.note-actions
.note-actions
-
if
note
.
for_personal_snippet?
-
if
note
.
for_personal_snippet?
...
...
changelogs/unreleased/jivl-add-dot-system-notes.yml
0 → 100644
View file @
6a10ed3f
---
title
:
Add dot to separate system notes content
merge_request
:
18864
author
:
type
:
changed
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