diff options
author | Rubén Dávila <ruben@gitlab.com> | 2018-03-07 10:58:50 -0500 |
---|---|---|
committer | Rubén Dávila <ruben@gitlab.com> | 2018-03-07 10:58:50 -0500 |
commit | d179f002d9a51ba3e082b5ae5943c0f31c694e4e (patch) | |
tree | 11c05d15a2a61603e95d1e30ef01bdbf038d5729 /app/controllers | |
parent | 42725ea96c7c2804d8a08130de529aceb87129d1 (diff) | |
download | gitlab-ce-d179f002d9a51ba3e082b5ae5943c0f31c694e4e.tar.gz |
CE backport for creating CI/CD projects from GitHub
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/import/github_controller.rb | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb index 69fb8121ded..eb7d5fca367 100644 --- a/app/controllers/import/github_controller.rb +++ b/app/controllers/import/github_controller.rb @@ -42,7 +42,9 @@ class Import::GithubController < Import::BaseController target_namespace = find_or_create_namespace(namespace_path, current_user.namespace_path) if can?(current_user, :create_projects, target_namespace) - project = Gitlab::LegacyGithubImport::ProjectCreator.new(repo, project_name, target_namespace, current_user, access_params, type: provider).execute + project = Gitlab::LegacyGithubImport::ProjectCreator + .new(repo, project_name, target_namespace, current_user, access_params, type: provider) + .execute(extra_project_attrs) if project.persisted? render json: ProjectSerializer.new.represent(project) @@ -73,15 +75,15 @@ class Import::GithubController < Import::BaseController end def new_import_url - public_send("new_import_#{provider}_url") # rubocop:disable GitlabSecurity/PublicSend + public_send("new_import_#{provider}_url", extra_import_params) # rubocop:disable GitlabSecurity/PublicSend end def status_import_url - public_send("status_import_#{provider}_url") # rubocop:disable GitlabSecurity/PublicSend + public_send("status_import_#{provider}_url", extra_import_params) # rubocop:disable GitlabSecurity/PublicSend end def callback_import_url - public_send("callback_import_#{provider}_url") # rubocop:disable GitlabSecurity/PublicSend + public_send("callback_import_#{provider}_url", extra_import_params) # rubocop:disable GitlabSecurity/PublicSend end def provider_unauthorized @@ -116,4 +118,12 @@ class Import::GithubController < Import::BaseController def client_options {} end + + def extra_project_attrs + {} + end + + def extra_import_params + {} + end end |