diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-18 13:24:34 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-31 11:35:05 +0100 |
| commit | 07c984d81cd7985d4ab7597cbb21b5f623b438e9 (patch) | |
| tree | 8296ba468bad7e2d62f8d82d6dcbfac5fa5a659e /app/views | |
| parent | 228926daee799c95e752a3c284c860e5bc60e528 (diff) | |
| download | gitlab-ce-07c984d81cd7985d4ab7597cbb21b5f623b438e9.tar.gz | |
Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 67403c36d7f..8227d977da9 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -58,14 +58,14 @@ #js-issuable-app{ "data" => { "endpoint" => realtime_changes_namespace_project_issue_path(@project.namespace, @project, @issue), "can-update" => can?(current_user, :update_issue, @issue).to_s, "issuable-ref" => @issue.to_reference, - } } + }.merge(updated_at_by(@issue)) } %h2.title= markdown_field(@issue, :title) - if @issue.description.present? .description{ class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : '' } .wiki= markdown_field(@issue, :description) %textarea.hidden.js-task-list-field= @issue.description - = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue-edited-ago js-issue-edited-ago') + = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue-edited-ago js-issue-edited-ago') #merge-requests{ data: { url: referenced_merge_requests_namespace_project_issue_url(@project.namespace, @project, @issue) } } // This element is filled in using JavaScript. |