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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
77a925f4
Commit
77a925f4
authored
Apr 26, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reorder discussion timestamp information for issues
parent
c866b5e4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
app/assets/javascripts/notes/components/note_edited_text.vue
app/assets/javascripts/notes/components/note_edited_text.vue
+5
-5
app/assets/javascripts/notes/components/note_header.vue
app/assets/javascripts/notes/components/note_header.vue
+1
-1
app/views/discussions/_discussion.html.haml
app/views/discussions/_discussion.html.haml
+1
-1
No files found.
app/assets/javascripts/notes/components/note_edited_text.vue
View file @
77a925f4
...
@@ -32,17 +32,17 @@ export default {
...
@@ -32,17 +32,17 @@ export default {
<
template
>
<
template
>
<div
:class=
"className"
>
<div
:class=
"className"
>
{{
actionText
}}
{{
actionText
}}
<time-ago-tooltip
:time=
"editedAt"
tooltip-placement=
"bottom"
/>
<template
v-if=
"editedBy"
>
<template
v-if=
"editedBy"
>
by
{{
s__
(
'
ByAuthor|by
'
)
}}
<a
<a
:href=
"editedBy.path"
:href=
"editedBy.path"
class=
"js-vue-author author_link"
>
class=
"js-vue-author author_link"
>
{{
editedBy
.
name
}}
{{
editedBy
.
name
}}
</a>
</a>
</
template
>
</
template
>
<time-ago-tooltip
:time=
"editedAt"
tooltip-placement=
"bottom"
/>
</div>
</div>
</template>
</template>
app/assets/javascripts/notes/components/note_header.vue
View file @
77a925f4
...
@@ -74,7 +74,7 @@ export default {
...
@@ -74,7 +74,7 @@ export default {
class=
"fa"
class=
"fa"
aria-hidden=
"true"
>
aria-hidden=
"true"
>
</i>
</i>
Toggle discussion
{{
__
(
'
Toggle discussion
'
)
}}
</button>
</button>
</div>
</div>
<a
:href=
"author.path"
>
<a
:href=
"author.path"
>
...
...
app/views/discussions/_discussion.html.haml
View file @
77a925f4
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
=
icon
(
"chevron-up"
)
=
icon
(
"chevron-up"
)
-
else
-
else
=
icon
(
"chevron-down"
)
=
icon
(
"chevron-down"
)
Toggle discussion
=
_
(
'Toggle discussion'
)
=
link_to_member
(
@project
,
discussion
.
author
,
avatar:
false
)
=
link_to_member
(
@project
,
discussion
.
author
,
avatar:
false
)
.inline.discussion-headline-light
.inline.discussion-headline-light
...
...
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