diff options
| author | George Tsiolis <tsiolis.g@gmail.com> | 2018-04-26 12:06:31 +0300 |
|---|---|---|
| committer | George Tsiolis <tsiolis.g@gmail.com> | 2018-05-04 10:42:42 +0300 |
| commit | 77a925f4a6bff04f0b40255e4dced741818149d7 (patch) | |
| tree | de461a3624214facecf9cd9dba873b4059dd1895 | |
| parent | c866b5e4401ec50567b3eaa3bffa11bc3831850f (diff) | |
| download | gitlab-ce-77a925f4a6bff04f0b40255e4dced741818149d7.tar.gz | |
Reorder discussion timestamp information for issues
| -rw-r--r-- | app/assets/javascripts/notes/components/note_edited_text.vue | 10 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/components/note_header.vue | 2 | ||||
| -rw-r--r-- | app/views/discussions/_discussion.html.haml | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/notes/components/note_edited_text.vue b/app/assets/javascripts/notes/components/note_edited_text.vue index 4ddca918495..2dc39d1a186 100644 --- a/app/assets/javascripts/notes/components/note_edited_text.vue +++ b/app/assets/javascripts/notes/components/note_edited_text.vue @@ -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> diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue index fbfd6f92c85..7183d0b50b2 100644 --- a/app/assets/javascripts/notes/components/note_header.vue +++ b/app/assets/javascripts/notes/components/note_header.vue @@ -74,7 +74,7 @@ export default { class="fa" aria-hidden="true"> </i> - Toggle discussion + {{ __('Toggle discussion') }} </button> </div> <a :href="author.path"> diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index e9589213f80..ebe8c327079 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -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 |