diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-08-17 19:27:11 +0200 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-08-17 19:27:11 +0200 |
commit | 7c491d4fefbd0a079a497e5cae07056bfe467622 (patch) | |
tree | 5e41c07992069943d6b4eff30b9f6a70b82f317a /app/views/projects/issues | |
parent | 5f758aff57dc54df7d92d0fb63e706d58cf1093d (diff) | |
download | gitlab-ce-7c491d4fefbd0a079a497e5cae07056bfe467622.tar.gz |
Misc tweaks
Diffstat (limited to 'app/views/projects/issues')
-rw-r--r-- | app/views/projects/issues/_discussion.html.haml | 8 | ||||
-rw-r--r-- | app/views/projects/issues/show.html.haml | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index 3e63758a5e5..483f28c74f2 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -1,12 +1,13 @@ - @gfm_form = true + - content_for :note_actions do - if can?(current_user, :update_issue, @issue) = 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 - #js-vue-notes{ data: { discussions_path: discussions_namespace_project_issue_path(@project.namespace, @project, @issue, format: :json), - register_path: "#{new_session_path(:user, redirect_to_referer: 'yes')}#register-pane", + #js-vue-notes{ data: { discussions_path: discussions_project_issue_path(@project, @issue, format: :json), + register_path: new_session_path(:user, redirect_to_referer: 'yes', anchor: 'register-pane'), new_session_path: new_session_path(:user, redirect_to_referer: 'yes'), markdown_docs_path: help_page_path('user/markdown'), quick_actions_docs_path: help_page_path('user/project/quick_actions'), @@ -14,6 +15,3 @@ last_fetched_at: Time.now.to_i, issue_data: serialize_issuable(@issue), current_user_data: UserSerializer.new.represent(current_user).to_json } } - - content_for :page_specific_javascripts do - = webpack_bundle_tag 'common_vue' - = webpack_bundle_tag 'notes' diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index f2141b84e6d..04b4ed95a2d 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -2,6 +2,11 @@ - page_title "#{@issue.title} (#{@issue.to_reference})", "Issues" - page_description @issue.description - page_card_attributes @issue.card_attributes + +- content_for :page_specific_javascripts do + = webpack_bundle_tag 'common_vue' + = webpack_bundle_tag 'notes' + - can_update_issue = can?(current_user, :update_issue, @issue) - can_report_spam = @issue.submittable_as_spam_by?(current_user) |