diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-17 23:35:06 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-17 23:35:06 +0300 |
| commit | dc396d0fa4b18815b4517c23b0d4e50c23b20db7 (patch) | |
| tree | e0c025eefa0e4ac7f4f82a4827f2d4e045a90f77 /app/views/projects/issues/show.html.haml | |
| parent | ab9970e22c7d68fd2338f0fa1a5cf3ad3ad4457b (diff) | |
| parent | 2941a76fe0fa5305bd6e31e6c47477732e3e7cec (diff) | |
Merge branch 'edited-text' into 'master'
Edited timeago text on comments
Unified the 'edited text' to be the same in descriptions and comments
Closes #5538
See merge request !3063
Diffstat (limited to 'app/views/projects/issues/show.html.haml')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 1e8308277cc..922a1390355 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -63,10 +63,7 @@ = markdown(@issue.description, cache_key: [@issue, "description"]) %textarea.hidden.js-task-list-field = @issue.description - - if @issue.updated_at != @issue.created_at - %small - Edited - = time_ago_with_tooltip(@issue.updated_at, placement: 'bottom', html_class: 'issue_edited_ago') + = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue_edited_ago') .merge-requests = render 'merge_requests' |