diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-11-30 14:01:14 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-11-30 14:01:14 +0300 |
| commit | feece7713247a063bfa71ab701f8a164e6fa71bb (patch) | |
| tree | a1de74f546c74cee85b4c5520e9de8ed45451048 /app/controllers | |
| parent | 41aa9fa7362d213e469c6aa9021abd0569e9f332 (diff) | |
| parent | 7277b3b32c2afd26a033ecf81b93319efb65861d (diff) | |
Merge branch '38668-revert-copied-kubernetesservice-logic' into 'master'
Copy `KubernetesService` logic in `Clusters::Platforms::Kubernetes` to make it interchangeable. And implement a selector.
See merge request gitlab-org/gitlab-ce!15515
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/branches_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index f28df83d5a5..56df9991fda 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -41,7 +41,7 @@ class Projects::BranchesController < Projects::ApplicationController branch_name = sanitize(strip_tags(params[:branch_name])) branch_name = Addressable::URI.unescape(branch_name) - redirect_to_autodeploy = project.empty_repo? && project.deployment_services.present? + redirect_to_autodeploy = project.empty_repo? && project.deployment_platform.present? result = CreateBranchService.new(project, current_user) .execute(branch_name, ref) |