diff options
| author | Simon Knox <psimyn@gmail.com> | 2019-06-05 06:11:56 +1000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2019-06-05 06:11:56 +1000 |
| commit | 443f87a7ed996017bc577f14fda586792e2216cf (patch) | |
| tree | 5c2ce3dfb1f0dfa7c8552462e0a2dfb23adcd31a /app/controllers/projects_controller.rb | |
| parent | 6f4ed5149d32e1b199a594db08a69366b2a85217 (diff) | |
| parent | 632427bcc24403be21df5afe8e6bae9cf41c8bc7 (diff) | |
| download | gitlab-ce-58516-dashboard-endpoint-fe.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 58516-dashboard-endpoint-fe58516-dashboard-endpoint-fe
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index e88c46144ef..12db493978b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -7,6 +7,7 @@ class ProjectsController < Projects::ApplicationController include PreviewMarkdown include SendFileUpload include RecordUserLastActivity + include ImportUrlParams prepend_before_action(only: [:show]) { authenticate_sessionless_user!(:rss) } @@ -333,6 +334,7 @@ class ProjectsController < Projects::ApplicationController def project_params(attributes: []) params.require(:project) .permit(project_params_attributes + attributes) + .merge(import_url_params) end def project_params_attributes |