BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
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
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
note_edited_text.vue
app/assets/javascripts/notes/components/note_edited_text.vue
+5
-5
note_header.vue
app/assets/javascripts/notes/components/note_header.vue
+1
-1
_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 {
<
template
>
<div
:class=
"className"
>
{{
actionText
}}
<time-ago-tooltip
:time=
"editedAt"
tooltip-placement=
"bottom"
/>
<template
v-if=
"editedBy"
>
by
{{
s__
(
'ByAuthor|by'
)
}}
<a
:href=
"editedBy.path"
class=
"js-vue-author author_link"
>
{{
editedBy
.
name
}}
</a>
</
template
>
<time-ago-tooltip
:time=
"editedAt"
tooltip-placement=
"bottom"
/>
</div>
</template>
app/assets/javascripts/notes/components/note_header.vue
View file @
77a925f4
...
...
@@ -74,7 +74,7 @@ export default {
class=
"fa"
aria-hidden=
"true"
>
</i>
Toggle discussion
{{
__
(
'Toggle discussion'
)
}}
</button>
</div>
<a
:href=
"author.path"
>
...
...
app/views/discussions/_discussion.html.haml
View file @
77a925f4
...
...
@@ -13,7 +13,7 @@
=
icon
(
"chevron-up"
)
-
else
=
icon
(
"chevron-down"
)
Toggle discussion
=
_
(
'Toggle discussion'
)
=
link_to_member
(
@project
,
discussion
.
author
,
avatar:
false
)
.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