diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-05 18:47:01 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-05 18:47:01 +0000 |
| commit | 240400152242924e75ea81918b5cfdcf2441549c (patch) | |
| tree | 3534cbdece629b2c193a1d09c832ab1d91696b5e /app/views | |
| parent | ecaa68a7095750ef7575fdefdb200ef01ef88748 (diff) | |
| parent | 8985ea1b9c649183e997a76c32aca927a258b51e (diff) | |
| download | gitlab-ce-240400152242924e75ea81918b5cfdcf2441549c.tar.gz | |
Merge branch 'issue-title-description-realtime' into 'master'
Render Description Realtime :tada:
Closes #25049 and #31355
See merge request !10865
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 1418ad73553..9084883eb3e 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -51,16 +51,11 @@ .issue-details.issuable-details .detail-page-description.content-block - .issue-title-data.hidden{ "data" => { "initial-title" => markdown_field(@issue, :title), - "endpoint" => rendered_title_namespace_project_issue_path(@project.namespace, @project, @issue), + .issue-title-data.hidden{ "data" => { "endpoint" => rendered_title_namespace_project_issue_path(@project.namespace, @project, @issue), + "can-update-tasks-class" => can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : '', } } .issue-title-entrypoint - - 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') #merge-requests{ data: { url: referenced_merge_requests_namespace_project_issue_url(@project.namespace, @project, @issue) } } |