diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2018-02-20 20:23:49 -0600 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2018-03-05 13:26:34 -0600 |
| commit | 32d121343d91eea44d1de344b398d30014180da0 (patch) | |
| tree | e2a873db36cf497e23ce29fb7136ad96dd868293 /app/controllers | |
| parent | 8ae57909a1ac5f398098f9d1c4581b3cf3d61674 (diff) | |
| download | gitlab-ce-32d121343d91eea44d1de344b398d30014180da0.tar.gz | |
CI/CD-only projects FE
See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839
Conflicts:
app/assets/javascripts/projects/project_new.js
app/views/shared/_import_form.html.haml
ee/app/controllers/ee/projects_controller.rb
ee/spec/features/projects/new_project_spec.rb
locale/gitlab.pot
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4a2f5ab3f88..67fad15ff92 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', locals: { active_tab: ('import' if project_params[:import_url].present?) } + render 'new', locals: { active_tab: active_new_project_tab } end end @@ -363,6 +363,10 @@ class ProjectsController < Projects::ApplicationController {} end + def active_new_project_tab + project_params[:import_url].present? ? 'import' : 'blank' + end + def repo_exists? project.repository_exists? && !project.empty_repo? |