Commit 7ec7e176 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'dz-backport-ee-changes' into 'master'

Backport github import fix from EE

See merge request gitlab-org/gitlab-ce!24462
parents c6eb4e14 1a93b231
......@@ -51,7 +51,11 @@ class Import::GithubController < Import::BaseController
private
def import_params
params.permit(:repo_id, :new_name, :target_namespace)
params.permit(permitted_import_params)
end
def permitted_import_params
[:repo_id, :new_name, :target_namespace]
end
def client
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment