summaryrefslogtreecommitdiff
path: root/app/models/project_auto_devops.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 15:06:17 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 15:06:17 +0000
commitb5ad06174bb1de39438c90847abb86ac6988e944 (patch)
tree1bb386b92f023fd2a8f776ccc10386675b3b1ef9 /app/models/project_auto_devops.rb
parent0a6ffb540e569bd7a7c548d59b12bc55d4bf9cf1 (diff)
downloadgitlab-ce-b5ad06174bb1de39438c90847abb86ac6988e944.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/project_auto_devops.rb')
-rw-r--r--app/models/project_auto_devops.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb
index e11d0c48b4b..275fe81583f 100644
--- a/app/models/project_auto_devops.rb
+++ b/app/models/project_auto_devops.rb
@@ -16,6 +16,7 @@ class ProjectAutoDevops < ApplicationRecord
def predefined_variables
Gitlab::Ci::Variables::Collection.new.tap do |variables|
+ variables.append(key: 'AUTO_DEVOPS_EXPLICITLY_ENABLED', value: '1') if enabled?
variables.concat(deployment_strategy_default_variables)
end
end