diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-08-18 18:51:43 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-08-18 18:52:17 +0300 |
| commit | 70a322c5dad6859919483086d3c065ac0f9b1e23 (patch) | |
| tree | 282ba329b063c97265a022c0a2b9bfb4faaf8774 /app | |
| parent | 4e77db396220ffea554ade7ea79f4f4120d1589b (diff) | |
| download | gitlab-ce-70a322c5dad6859919483086d3c065ac0f9b1e23.tar.gz | |
IssueNotesRefactor: Support legacy last edited by case.
Diffstat (limited to 'app')
3 files changed, 11 insertions, 9 deletions
diff --git a/app/assets/javascripts/notes/components/issue_discussion.vue b/app/assets/javascripts/notes/components/issue_discussion.vue index 96c63e587af..1a8d3b98309 100644 --- a/app/assets/javascripts/notes/components/issue_discussion.vue +++ b/app/assets/javascripts/notes/components/issue_discussion.vue @@ -170,7 +170,7 @@ class="discussion" /> <issue-note-edited-text - v-if="lastUpdatedBy" + v-if="lastUpdatedAt" :edited-at="lastUpdatedAt" :edited-by="lastUpdatedBy" action-text="Last updated" diff --git a/app/assets/javascripts/notes/components/issue_note_body.vue b/app/assets/javascripts/notes/components/issue_note_body.vue index 7d4333e4d27..8e35920e659 100644 --- a/app/assets/javascripts/notes/components/issue_note_body.vue +++ b/app/assets/javascripts/notes/components/issue_note_body.vue @@ -99,7 +99,7 @@ :data-update-url="note.path" class="hidden js-task-list-field"></textarea> <issue-note-edited-text - v-if="note.last_edited_by" + v-if="note.last_edited_at" :edited-at="note.last_edited_at" :edited-by="note.last_edited_by" action-text="Edited" diff --git a/app/assets/javascripts/notes/components/issue_note_edited_text.vue b/app/assets/javascripts/notes/components/issue_note_edited_text.vue index 315fa61cfcc..49e09f0ecc5 100644 --- a/app/assets/javascripts/notes/components/issue_note_edited_text.vue +++ b/app/assets/javascripts/notes/components/issue_note_edited_text.vue @@ -14,7 +14,7 @@ }, editedBy: { type: Object, - required: true, + required: false, }, className: { type: String, @@ -35,11 +35,13 @@ :time="editedAt" tooltip-placement="bottom" /> - by - <a - :href="editedBy.path" - class="js-vue-author author_link"> - {{editedBy.name}} - </a> + <template v-if="editedBy"> + by + <a + :href="editedBy.path" + class="js-vue-author author_link"> + {{editedBy.name}} + </a> + </template> </div> </template> |