diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2017-04-29 10:54:37 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2017-05-04 12:58:41 +1100 |
| commit | 323596f68efe95b479a0dc29832b8033a1eddef0 (patch) | |
| tree | cbf2190f46a6df26f694ae67ce1c2b0f826a71c8 /app/views | |
| parent | 4faa65d8381f3e1e45bdf3a9bc9785b588891b66 (diff) | |
| download | gitlab-ce-323596f68efe95b479a0dc29832b8033a1eddef0.tar.gz | |
Add system note on description change of issue/merge request
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_box.html.haml | 2 |
2 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 2a871966aa8..9bddc3ac44d 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -61,7 +61,7 @@ = 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') + = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue_edited_ago', include_author: true) #merge-requests{ data: { url: referenced_merge_requests_namespace_project_issue_url(@project.namespace, @project, @issue) } } // This element is filled in using JavaScript. diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml index 8a390cf8700..3b2cbb12a85 100644 --- a/app/views/projects/merge_requests/show/_mr_box.html.haml +++ b/app/views/projects/merge_requests/show/_mr_box.html.haml @@ -10,4 +10,4 @@ %textarea.hidden.js-task-list-field = @merge_request.description - = edited_time_ago_with_tooltip(@merge_request, placement: 'bottom') + = edited_time_ago_with_tooltip(@merge_request, placement: 'bottom', include_author: true) |