b1c9475443
In Rails 4.2 and below, skipping callbacks (skip_before_action, skip_after_action, etc.) that use methods which do not exist will not throw any errors.
On the other hand, Rails 5 does. See https://github.com/rails/rails/pull/19029
After testing with Rails 5 I noticed there are some methods that don't actually exist (because they were renamed, usually), this fixes a few instances of those.
reject_blocked! was introduced in c9def945d4, I can't find any references to reject_blocked ever existing.
62 lines
1.7 KiB
Ruby
62 lines
1.7 KiB
Ruby
class SearchController < ApplicationController
|
|
skip_before_action :authenticate_user!, :reject_blocked!
|
|
|
|
include SearchHelper
|
|
|
|
layout 'search'
|
|
|
|
def show
|
|
return if params[:search].nil? || params[:search].blank?
|
|
|
|
if params[:project_id].present?
|
|
@project = Project.find_by(id: params[:project_id])
|
|
@project = nil unless can?(current_user, :download_code, @project)
|
|
end
|
|
|
|
if params[:group_id].present?
|
|
@group = Group.find_by(id: params[:group_id])
|
|
@group = nil unless can?(current_user, :read_group, @group)
|
|
end
|
|
|
|
@search_term = params[:search]
|
|
|
|
@scope = params[:scope]
|
|
@show_snippets = params[:snippets].eql? 'true'
|
|
|
|
@search_results =
|
|
if @project
|
|
unless %w(blobs notes issues merge_requests milestones wiki_blobs
|
|
commits).include?(@scope)
|
|
@scope = 'blobs'
|
|
end
|
|
|
|
Search::ProjectService.new(@project, current_user, params).execute
|
|
elsif @show_snippets
|
|
unless %w(snippet_blobs snippet_titles).include?(@scope)
|
|
@scope = 'snippet_blobs'
|
|
end
|
|
|
|
Search::SnippetService.new(current_user, params).execute
|
|
else
|
|
unless %w(projects issues merge_requests milestones).include?(@scope)
|
|
@scope = 'projects'
|
|
end
|
|
Search::GlobalService.new(current_user, params).execute
|
|
end
|
|
|
|
@search_objects = @search_results.objects(@scope, params[:page])
|
|
end
|
|
|
|
def autocomplete
|
|
term = params[:term]
|
|
|
|
if params[:project_id].present?
|
|
@project = Project.find_by(id: params[:project_id])
|
|
@project = nil unless can?(current_user, :read_project, @project)
|
|
end
|
|
|
|
@ref = params[:project_ref] if params[:project_ref].present?
|
|
|
|
render json: search_autocomplete_opts(term).to_json
|
|
end
|
|
end
|