Commit 32e6193a authored by Zehua Zhang's avatar Zehua Zhang

Allow specifying project name on importing an exported GitLab project

Changelog: fixed
parent d417dfd0
...@@ -38,7 +38,7 @@ class Import::GitlabProjectsController < Import::BaseController ...@@ -38,7 +38,7 @@ class Import::GitlabProjectsController < Import::BaseController
def project_params def project_params
params.permit( params.permit(
:path, :namespace_id, :file :name, :path, :namespace_id, :file
) )
end end
......
...@@ -41,7 +41,7 @@ RSpec.describe 'Import/Export - project import integration test', :js do ...@@ -41,7 +41,7 @@ RSpec.describe 'Import/Export - project import integration test', :js do
project = Project.last project = Project.last
expect(project).not_to be_nil 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 end
it 'invalid project' do 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