Merge branch 'id-fix-overriding-of-import-params' into '11-11-stable'

Fix the overriding of EE import params

See merge request gitlab/gitlabhq!3129

2 files changed, 12 insertions, 7 deletions

diff --git a/app/controllers/concerns/import_url_params.rb b/app/controllers/concerns/import_url_params.rb
index d9070e51573..765654ca2cb 100644
--- a/app/controllers/concerns/import_url_params.rb
+++ b/app/controllers/concerns/import_url_params.rb
@@ -2,12 +2,7 @@
 
 module ImportUrlParams
   def import_url_params
-    import_params =
-      params
-        .require(:project)
-        .permit(:import_url, :import_url_user, :import_url_password)
-
-    { import_url: import_params_to_full_url(import_params) }
+    { import_url: import_params_to_full_url(params[:project]) }
   end
 
   def import_params_to_full_url(params)
diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb
index 25a137eeb38..afbf9fd7720 100644
--- a/app/controllers/projects/imports_controller.rb
+++ b/app/controllers/projects/imports_controller.rb
@@ -14,7 +14,7 @@ class Projects::ImportsController < Projects::ApplicationController
   end
 
   def create
-    if @project.update(import_url_params)
+    if @project.update(import_params)
       @project.import_state.reset.schedule
     end
 
@@ -66,4 +66,14 @@ class Projects::ImportsController < Projects::ApplicationController
       redirect_to project_path(@project)
     end
   end
+
+  def import_params_attributes
+    []
+  end
+
+  def import_params
+    params.require(:project)
+      .permit(import_params_attributes)
+      .merge(import_url_params)
+  end
 end