diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /app/services/import/github_service.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/services/import/github_service.rb')
-rw-r--r-- | app/services/import/github_service.rb | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/app/services/import/github_service.rb b/app/services/import/github_service.rb index 948dba2d206..847c5eb4397 100644 --- a/app/services/import/github_service.rb +++ b/app/services/import/github_service.rb @@ -31,9 +31,8 @@ module Import project_name, target_namespace, current_user, - access_params, - type: provider - ).execute(extra_project_attrs) + type: provider, + **access_params).execute(extra_project_attrs) end def repo @@ -71,11 +70,9 @@ module Import def blocked_url? Gitlab::UrlBlocker.blocked_url?( url, - { - allow_localhost: allow_local_requests?, - allow_local_network: allow_local_requests?, - schemes: %w(http https) - } + allow_localhost: allow_local_requests?, + allow_local_network: allow_local_requests?, + schemes: %w(http https) ) end |