diff options
| author | Phil Hughes <me@iamphill.com> | 2018-02-23 12:18:48 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-02-23 12:18:48 +0300 |
| commit | 981b5905a02ac89ca9f33ad7c91d8c1a576ed9af (patch) | |
| tree | a0d52627c9bfd49ca94cac86aa013aa5bbf0399c /app/controllers/projects_controller.rb | |
| parent | f4bc6ec92e2af0b6cfd64f9ff0ca683bf62820d1 (diff) | |
| parent | 2aacb7fb435f669aa3860c7220835f04e208188b (diff) | |
Merge branch '43261-fix-import-from-url-name-collision-active-tab' into 'master'
Keep "Import project" tab/form active when validation fails trying to import "Repo by URL"
Closes #43261
See merge request gitlab-org/gitlab-ce!17136
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d9aa95fcb3d..913689a1e74 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -45,7 +45,7 @@ class ProjectsController < Projects::ApplicationController notice: _("Project '%{project_name}' was successfully created.") % { project_name: @project.name } ) else - render 'new' + render 'new', locals: { active_tab: ('import' if project_params[:import_url].present?) } end end |