Commit 8ae57909 authored by Eric Eastwood's avatar Eric Eastwood

Backport BE changes from CI/CD projects ee!4567

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4567
parent c9660b45
...@@ -41,7 +41,7 @@ class ProjectsController < Projects::ApplicationController ...@@ -41,7 +41,7 @@ class ProjectsController < Projects::ApplicationController
cookies[:issue_board_welcome_hidden] = { path: project_path(@project), value: nil, expires: Time.at(0) } cookies[:issue_board_welcome_hidden] = { path: project_path(@project), value: nil, expires: Time.at(0) }
redirect_to( redirect_to(
project_path(@project), project_path(@project, custom_import_params),
notice: _("Project '%{project_name}' was successfully created.") % { project_name: @project.name } notice: _("Project '%{project_name}' was successfully created.") % { project_name: @project.name }
) )
else else
...@@ -103,7 +103,7 @@ class ProjectsController < Projects::ApplicationController ...@@ -103,7 +103,7 @@ class ProjectsController < Projects::ApplicationController
def show def show
if @project.import_in_progress? if @project.import_in_progress?
redirect_to project_import_path(@project) redirect_to project_import_path(@project, custom_import_params)
return return
end end
...@@ -359,6 +359,10 @@ class ProjectsController < Projects::ApplicationController ...@@ -359,6 +359,10 @@ class ProjectsController < Projects::ApplicationController
] ]
end end
def custom_import_params
{}
end
def repo_exists? def repo_exists?
project.repository_exists? && !project.empty_repo? project.repository_exists? && !project.empty_repo?
......
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