cfaf012c53
Previously import_url would always be present in the update parameters, which would cause the validation to fail. We now only include this parameter only if there is URL given. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62708
19 lines
452 B
Ruby
19 lines
452 B
Ruby
# frozen_string_literal: true
|
|
|
|
module ImportUrlParams
|
|
def import_url_params
|
|
return {} unless params.dig(:project, :import_url).present?
|
|
|
|
{ import_url: import_params_to_full_url(params[:project]) }
|
|
end
|
|
|
|
def import_params_to_full_url(params)
|
|
Gitlab::UrlSanitizer.new(
|
|
params[:import_url],
|
|
credentials: {
|
|
user: params[:import_url_user],
|
|
password: params[:import_url_password]
|
|
}
|
|
).full_url
|
|
end
|
|
end
|