Commit 28db4da9 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix/gitlab-import-project-name-not-correctly' into 'master'

Allow specifying project name on importing an exported GitLab project

See merge request gitlab-org/gitlab!80150
parents e0e4f6c8 32e6193a
......@@ -38,7 +38,7 @@ class Import::GitlabProjectsController < Import::BaseController
def project_params
params.permit(
:path, :namespace_id, :file
:name, :path, :namespace_id, :file
)
end
......
......@@ -41,7 +41,7 @@ RSpec.describe 'Import/Export - project import integration test', :js do
project = Project.last
expect(project).not_to be_nil
expect(page).to have_content("Project 'test-project-path' is being imported")
expect(page).to have_content("Project 'Test Project Name' is being imported")
end
it 'invalid project' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment