diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-02-21 12:59:23 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-02-21 12:59:23 +0300 |
| commit | 499ca7f2e2d07ac244b5034d2f8d32a8bc200b9e (patch) | |
| tree | b787b847fb6eb4b265f3a433140263d0a59225b7 /app/views | |
| parent | ee74f7b8e5a4a4bdc84a2d50bd34a7bfa6463a3f (diff) | |
| parent | 810a8b78b6ab09ea0259f5b6487d9ff2499d3caf (diff) | |
Merge branch 'design-management-issue-tab-ce' into 'master'
CE backport of design-management-issue-tab
See merge request gitlab-org/gitlab-ce!25429
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/issues/_discussion.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index 4917f4b8903..42b6aaa2634 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -5,7 +5,7 @@ = link_to 'Reopen issue', issue_path(@issue, issue: {state_event: :reopen}, format: 'json'), data: {original_text: "Reopen issue", alternative_text: "Comment & reopen issue"}, class: "btn btn-nr btn-reopen btn-comment js-note-target-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue' = link_to 'Close issue', issue_path(@issue, issue: {state_event: :close}, format: 'json'), data: {original_text: "Close issue", alternative_text: "Comment & close issue"}, class: "btn btn-nr btn-close btn-comment js-note-target-close #{issue_button_visibility(@issue, true)}", title: 'Close issue' -%section.js-vue-notes-event +%section.issuable-discussion.js-vue-notes-event #js-vue-notes{ data: { notes_data: notes_data(@issue).to_json, noteable_data: serialize_issuable(@issue), noteable_type: 'Issue', diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 653b7d4c6f3..ca03a3ce75e 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -88,7 +88,6 @@ #js-vue-discussion-filter{ data: { default_filter: current_user&.notes_filter_for(@issue), notes_filters: UserPreference.notes_filters.to_json } } = render 'new_branch' unless @issue.confidential? - %section.issuable-discussion - = render 'projects/issues/discussion' + = render_if_exists 'projects/issues/discussion' = render 'shared/issuable/sidebar', issuable_sidebar: @issuable_sidebar, assignees: @issue.assignees |