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
48ddf84a
Commit
48ddf84a
authored
Aug 25, 2020
by
Natalia Tepluhina
Committed by
Jose Ivan Vargas
Aug 25, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Design comments: Text wrapping behavior"
parent
ae81cd5d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
11 deletions
+23
-11
app/assets/javascripts/design_management/components/design_notes/design_note.vue
...design_management/components/design_notes/design_note.vue
+6
-6
changelogs/unreleased/209770-design-comments-text-wrapping-behavior.yml
...eleased/209770-design-comments-text-wrapping-behavior.yml
+5
-0
spec/frontend/design_management/components/design_notes/__snapshots__/design_note_spec.js.snap
...nents/design_notes/__snapshots__/design_note_spec.js.snap
+10
-1
spec/frontend/design_management/components/design_notes/design_note_spec.js
...gn_management/components/design_notes/design_note_spec.js
+2
-4
No files found.
app/assets/javascripts/design_management/components/design_notes/design_note.vue
View file @
48ddf84a
...
...
@@ -102,12 +102,12 @@ export default {
</a>
<span
class=
"note-headline-light note-headline-meta"
>
<span
class=
"system-note-message"
>
<slot></slot>
</span>
<
template
v-if=
"note.createdAt"
>
<span
class=
"system-note-separator"
></span>
<a
class=
"note-timestamp system-note-separator"
:href=
"`#note_$
{noteAnchorId}`">
<time-ago-tooltip
:time=
"note.createdAt"
tooltip-placement=
"bottom"
/
>
<
/a
>
</
template
>
<
a
class=
"note-timestamp system-note-separator gl-display-block gl-mb-2"
:href=
"`#note_$
{noteAnchorId}`"
>
<
time-ago-tooltip
:time=
"note.createdAt"
tooltip-placement=
"bottom"
/
>
</
a
>
</span>
</div>
<div
class=
"gl-display-flex"
>
...
...
changelogs/unreleased/209770-design-comments-text-wrapping-behavior.yml
0 → 100644
View file @
48ddf84a
---
title
:
'
Resolve
Design
comments:
Text
wrapping
behavior'
merge_request
:
40359
author
:
type
:
fixed
spec/frontend/design_management/components/design_notes/__snapshots__/design_note_spec.js.snap
View file @
48ddf84a
...
...
@@ -46,7 +46,16 @@ exports[`Design note component should match the snapshot 1`] = `
class="system-note-message"
/>
<!---->
<a
class="note-timestamp system-note-separator gl-display-block gl-mb-2"
href="#note_123"
>
<time-ago-tooltip-stub
cssclass=""
time="2019-07-26T15:02:20Z"
tooltipplacement="bottom"
/>
</a>
</span>
</div>
...
...
spec/frontend/design_management/components/design_notes/design_note_spec.js
View file @
48ddf84a
...
...
@@ -15,6 +15,7 @@ const note = {
userPermissions
:
{
adminNote
:
false
,
},
createdAt
:
'
2019-07-26T15:02:20Z
'
,
};
HTMLElement
.
prototype
.
scrollIntoView
=
scrollIntoViewMock
;
...
...
@@ -79,10 +80,7 @@ describe('Design note component', () => {
it
(
'
should render a time ago tooltip if note has createdAt property
'
,
()
=>
{
createComponent
({
note
:
{
...
note
,
createdAt
:
'
2019-07-26T15:02:20Z
'
,
},
note
,
});
expect
(
wrapper
.
find
(
TimeAgoTooltip
).
exists
()).
toBe
(
true
);
...
...
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