diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-12 08:42:48 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-12 08:42:48 +0000 |
| commit | 20987f4fd2d6a5ab27e61a4afc038999937adade (patch) | |
| tree | b746584f14c798a6bc3b553005b36f347950ae4b /app/views/projects | |
| parent | 2ac27a96b86738bd272e434d7f82c5faf8bb578c (diff) | |
| parent | 3dfce3ab6b092ec40dc95fa292b87f841abf0eba (diff) | |
| download | gitlab-ce-20987f4fd2d6a5ab27e61a4afc038999937adade.tar.gz | |
Merge branch 'refactor-realtime-issue' into 'master'
Refactored issue tealtime elements
See merge request !11242
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 9084883eb3e..f66724900de 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -51,12 +51,17 @@ .issue-details.issuable-details .detail-page-description.content-block - .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' : '', + #js-issuable-app{ "data" => { "endpoint" => rendered_title_namespace_project_issue_path(@project.namespace, @project, @issue), + "can-update" => can?(current_user, :update_issue, @issue).to_s, + "issuable-ref" => @issue.to_reference, } } - .issue-title-entrypoint + %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') + = 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. |