summaryrefslogtreecommitdiff
path: root/app/helpers/notes_helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/notes_helper.rb')
-rw-r--r--app/helpers/notes_helper.rb41
1 files changed, 21 insertions, 20 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index aaf38cbfe70..7efeb19ddb0 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -17,7 +17,7 @@ module NotesHelper
id: noteable.id,
class: noteable.class.name,
resources: noteable.class.table_name,
- project_id: noteable.project.id
+ project_id: noteable.project.id,
}.to_json
end
@@ -32,7 +32,7 @@ module NotesHelper
data = {
line_code: line_code,
- line_type: line_type
+ line_type: line_type,
}
if @use_legacy_diff_notes
@@ -48,12 +48,12 @@ module NotesHelper
def add_diff_note_button(line_code, position, line_type)
return if @diff_notes_disabled
- button_tag '',
- class: 'add-diff-note js-add-diff-note-button',
- type: 'submit', name: 'button',
+ button_tag "",
+ class: "add-diff-note js-add-diff-note-button",
+ type: "submit", name: "button",
data: diff_view_line_data(line_code, position, line_type),
- title: 'Add a comment to this line' do
- icon('comment-o')
+ title: "Add a comment to this line" do
+ icon("comment-o")
end
end
@@ -63,11 +63,11 @@ module NotesHelper
data = {
discussion_id: discussion.reply_id,
discussion_project_id: discussion.project&.id,
- line_type: line_type
+ line_type: line_type,
}
- button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button',
- data: data, title: 'Add a reply'
+ button_tag "Reply...", class: "btn btn-text-field js-discussion-reply-button",
+ data: data, title: "Add a reply"
end
def note_max_access_for_user(note)
@@ -95,7 +95,8 @@ module NotesHelper
if @snippet.is_a?(PersonalSnippet)
snippet_notes_path(@snippet, params)
else
- params.merge!(target_id: @noteable.id, target_type: @noteable.class.name.underscore)
+ params[:target_id] = @noteable.id
+ params[:target_type] = @noteable.class.name.underscore
project_noteable_notes_path(@project, params)
end
@@ -152,8 +153,8 @@ module NotesHelper
mergeRequests: autocomplete,
epics: autocomplete,
milestones: autocomplete,
- labels: autocomplete
- }
+ labels: autocomplete,
+ },
}
end
@@ -168,20 +169,20 @@ module NotesHelper
def notes_data(issuable)
{
discussionsPath: discussions_path(issuable),
- registerPath: new_session_path(:user, redirect_to_referer: 'yes', anchor: 'register-pane'),
- newSessionPath: new_session_path(:user, redirect_to_referer: 'yes'),
- markdownDocsPath: help_page_path('user/markdown'),
- quickActionsDocsPath: help_page_path('user/project/quick_actions'),
+ registerPath: new_session_path(:user, redirect_to_referer: "yes", anchor: "register-pane"),
+ newSessionPath: new_session_path(:user, redirect_to_referer: "yes"),
+ markdownDocsPath: help_page_path("user/markdown"),
+ quickActionsDocsPath: help_page_path("user/project/quick_actions"),
closePath: close_issuable_path(issuable),
reopenPath: reopen_issuable_path(issuable),
notesPath: notes_url,
totalNotes: issuable.discussions.length,
- lastFetchedAt: Time.now.to_i
+ lastFetchedAt: Time.now.to_i,
}
end
def discussion_resolved_intro(discussion)
- discussion.resolved_by_push? ? 'Automatically resolved' : 'Resolved'
+ discussion.resolved_by_push? ? "Automatically resolved" : "Resolved"
end
def rendered_for_merge_request?
@@ -189,6 +190,6 @@ module NotesHelper
end
def serialize_notes?
- rendered_for_merge_request? || params['html'].nil?
+ rendered_for_merge_request? || params["html"].nil?
end
end