Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-06-02 19:17:54 +0300
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-06-02 19:17:54 +0300
commit5a4a08249055022e9e6e30d9ab38c45c1bf71842 (patch)
treeeda99155dee262f3965a7938c9184e73022cf48a /app/views/projects/issues/show.html.haml
parente591401b0b3f08baf4cd28d0fcb8e184a515fc74 (diff)
parentaea03d7cdfb882762426dbb5cab805682afe5e2a (diff)
Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-for-issues-9-3
Diffstat (limited to 'app/views/projects/issues/show.html.haml')
-rw-r--r--app/views/projects/issues/show.html.haml5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 4ce1f56da7d..d909b0bfbbd 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -31,7 +31,7 @@
%ul
- if can_update_issue
%li
- = link_to 'Edit', edit_namespace_project_issue_path(@project.namespace, @project, @issue)
+ = link_to 'Edit', edit_namespace_project_issue_path(@project.namespace, @project, @issue), class: 'issuable-edit'
%li
= link_to 'Close issue', issue_path(@issue, issue: { state_event: :close }, format: 'json'), class: "btn-close #{issue_button_visibility(@issue, true)}", title: 'Close issue'
%li
@@ -55,7 +55,8 @@
.issue-details.issuable-details
.detail-page-description.content-block
- #js-issuable-app{ data: issuable_app_data(@project, @issue) }
+ %script#js-issuable-app-initial-data{ type: "application/json" }= issuable_initial_data(@issue)
+ #js-issuable-app
%h2.title= markdown_field(@issue, :title)
- if @issue.description.present?
.description{ class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : '' }