8fd2c08472
The check for continue_params&.key?(:to) in Projects::ImportsController caused an exception in redirect_to if this key contained a nil value. Since url_for won't add any params for an empty hash, we can just return that in continue_params if params[:continue] isn't present, and simplify the code in the controllers to check for the values we actually want to use.
64 lines
2.1 KiB
Ruby
64 lines
2.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Projects::ForksController < Projects::ApplicationController
|
|
include ContinueParams
|
|
|
|
# Authorize
|
|
before_action :whitelist_query_limiting, only: [:create]
|
|
before_action :require_non_empty_project
|
|
before_action :authorize_download_code!
|
|
before_action :authenticate_user!, only: [:new, :create]
|
|
|
|
# rubocop: disable CodeReuse/ActiveRecord
|
|
def index
|
|
base_query = project.forks.includes(:creator)
|
|
|
|
forks = ForkProjectsFinder.new(project, params: params.merge(search: params[:filter_projects]), current_user: current_user).execute
|
|
@total_forks_count = base_query.size
|
|
@private_forks_count = @total_forks_count - forks.size
|
|
@public_forks_count = @total_forks_count - @private_forks_count
|
|
|
|
@forks = forks.page(params[:page])
|
|
|
|
respond_to do |format|
|
|
format.html
|
|
|
|
format.json do
|
|
render json: {
|
|
html: view_to_html_string("projects/forks/_projects", projects: @forks)
|
|
}
|
|
end
|
|
end
|
|
end
|
|
# rubocop: enable CodeReuse/ActiveRecord
|
|
|
|
def new
|
|
@namespaces = current_user.manageable_namespaces
|
|
@namespaces.delete(@project.namespace)
|
|
end
|
|
|
|
# rubocop: disable CodeReuse/ActiveRecord
|
|
def create
|
|
namespace = Namespace.find(params[:namespace_key])
|
|
|
|
@forked_project = namespace.projects.find_by(path: project.path)
|
|
@forked_project = nil unless @forked_project && @forked_project.forked_from_project == project
|
|
|
|
@forked_project ||= ::Projects::ForkService.new(project, current_user, namespace: namespace).execute
|
|
|
|
if !@forked_project.saved? || !@forked_project.forked?
|
|
render :error
|
|
elsif @forked_project.import_in_progress?
|
|
redirect_to project_import_path(@forked_project, continue: continue_params)
|
|
elsif continue_params[:to]
|
|
redirect_to continue_params[:to], notice: continue_params[:notice]
|
|
else
|
|
redirect_to project_path(@forked_project), notice: "The project '#{@forked_project.name}' was successfully forked."
|
|
end
|
|
end
|
|
# rubocop: enable CodeReuse/ActiveRecord
|
|
|
|
def whitelist_query_limiting
|
|
Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42335')
|
|
end
|
|
end
|