diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-30 11:13:49 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-30 11:13:49 +0100 |
| commit | 759f102df09a7877ae68ab05b87d3a434f588067 (patch) | |
| tree | e5f002acff468f5e84ade40c31e5e4b991899f1e /app/views/projects/issues/show.html.haml | |
| parent | adff7923ca3088df9e07ccd60d6f9fa24fbdbfc5 (diff) | |
| parent | 03f13af588cf2b578a27717db492c216fcafbf9a (diff) | |
| download | gitlab-ce-759f102df09a7877ae68ab05b87d3a434f588067.tar.gz | |
Merge branch 'master' into balsalmiq-support
Diffstat (limited to 'app/views/projects/issues/show.html.haml')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 4d56aa214e2..2a871966aa8 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -58,8 +58,7 @@ - if @issue.description.present? .description{ class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : '' } .wiki - = preserve do - = markdown_field(@issue, :description) + = 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') |