diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-04-19 18:24:32 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-20 12:55:59 +0300 |
commit | 11d066cc851cfd01b9abb3b9285ecbfe6388dc45 (patch) | |
tree | b7945ad10641191a783c1edd631966159c9b23d7 /app | |
parent | c30de8d6ed74c969a09227172aee8bfb2cc64c88 (diff) |
Merge branch 'fj-42601-respect-visibility-options' into 'master'
Respect visibility options and description when importing project from template
Closes #42601
See merge request gitlab-org/gitlab-ce!18473
Diffstat (limited to 'app')
-rw-r--r-- | app/services/projects/create_from_template_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/projects/create_from_template_service.rb b/app/services/projects/create_from_template_service.rb index a549cfbabea..29b133cc466 100644 --- a/app/services/projects/create_from_template_service.rb +++ b/app/services/projects/create_from_template_service.rb @@ -8,9 +8,10 @@ module Projects template_name = params.delete(:template_name) file = Gitlab::ProjectTemplate.find(template_name).file + override_params = params.dup params[:file] = file - GitlabProjectsImportService.new(current_user, params).execute + GitlabProjectsImportService.new(current_user, params, override_params).execute ensure file&.close |