Merge pull request #6075 from skv-headless/remove_deprecated_finders

Remove deprecated finders

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/projects/issues_controller.rb
Simple merge

diff --cc app/controllers/projects/merge_requests_controller.rb
Simple merge

diff --cc app/controllers/search_controller.rb
index 0152d53,d98a44e..c1648d6
--- 1/app/controllers/search_controller.rb
--- 2/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@@ -1,9 -1,7 +1,9 @@@
  class SearchController < ApplicationController
 +  include SearchHelper
 +
    def show
-     @project = Project.find_by_id(params[:project_id]) if params[:project_id].present?
-     @group = Group.find_by_id(params[:group_id]) if params[:group_id].present?
+     @project = Project.find_by(id: params[:project_id]) if params[:project_id].present?
+     @group = Group.find_by(id: params[:group_id]) if params[:group_id].present?
  
      if @project
        return access_denied! unless can?(current_user, :download_code, @project)

diff --cc app/models/project.rb
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc lib/api/entities.rb
Simple merge

diff --cc lib/api/users.rb
Simple merge

diff --cc lib/tasks/gitlab/import.rake
Simple merge