summaryrefslogtreecommitdiff
path: root/app/controllers/projects/notes_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
-rw-r--r--app/controllers/projects/notes_controller.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 3152a38fd8e..015de870b16 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -32,7 +32,7 @@ class Projects::NotesController < Projects::ApplicationController
else
render json: {
resolved_by: note.resolved_by.try(:name),
- discussion_headline_html: (view_to_html_string('discussions/_headline', discussion: discussion) if discussion)
+ discussion_headline_html: (view_to_html_string("discussions/_headline", discussion: discussion) if discussion),
}
end
end
@@ -48,7 +48,7 @@ class Projects::NotesController < Projects::ApplicationController
render_json_with_notes_serializer
else
render json: {
- discussion_headline_html: (view_to_html_string('discussions/_headline', discussion: discussion) if discussion)
+ discussion_headline_html: (view_to_html_string("discussions/_headline", discussion: discussion) if discussion),
}
end
end
@@ -65,7 +65,7 @@ class Projects::NotesController < Projects::ApplicationController
@note ||= @project.notes.find(params[:id])
end
- alias_method :awardable, :note
+ alias awardable note
def finder_params
params.merge(last_fetched_at: last_fetched_at, notes_filter: notes_filter)
@@ -86,6 +86,6 @@ class Projects::NotesController < Projects::ApplicationController
end
def whitelist_query_limiting
- Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42383')
+ Gitlab::QueryLimiting.whitelist("https://gitlab.com/gitlab-org/gitlab-ce/issues/42383")
end
end