summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2018-03-01 18:24:25 -0600
committerEric Eastwood <contact@ericeastwood.com>2018-03-02 17:17:05 -0600
commit8ae57909a1ac5f398098f9d1c4581b3cf3d61674 (patch)
tree99952fea22727a3e050c2b1e38150bd7e822e960
parentc9660b45b19287775068dc7109b711c10b4c8867 (diff)
downloadgitlab-ce-8ae57909a1ac5f398098f9d1c4581b3cf3d61674.tar.gz
Backport BE changes from CI/CD projects ee!4567
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4567
-rw-r--r--app/controllers/projects_controller.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 913689a1e74..4a2f5ab3f88 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -41,7 +41,7 @@ class ProjectsController < Projects::ApplicationController
cookies[:issue_board_welcome_hidden] = { path: project_path(@project), value: nil, expires: Time.at(0) }
redirect_to(
- project_path(@project),
+ project_path(@project, custom_import_params),
notice: _("Project '%{project_name}' was successfully created.") % { project_name: @project.name }
)
else
@@ -103,7 +103,7 @@ class ProjectsController < Projects::ApplicationController
def show
if @project.import_in_progress?
- redirect_to project_import_path(@project)
+ redirect_to project_import_path(@project, custom_import_params)
return
end
@@ -359,6 +359,10 @@ class ProjectsController < Projects::ApplicationController
]
end
+ def custom_import_params
+ {}
+ end
+
def repo_exists?
project.repository_exists? && !project.empty_repo?