Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-01-15 13:23:32 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-01-15 13:23:32 +0300
commit3c5846cdaae8784ca8c91308c42a7d4f5b91ac0a (patch)
treec1ee0973d076db8a84723c19b9a8dbdf52e1064a /lib/gitlab/ci
parent7b712d359880cb15bad4c0f01308bf12b1518e60 (diff)
Simplify code related to setting default config values
Diffstat (limited to 'lib/gitlab/ci')
-rw-r--r--lib/gitlab/ci/config/entry/policy.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/entry/policy.rb b/lib/gitlab/ci/config/entry/policy.rb
index 5195c4d87fe..9c677bf6617 100644
--- a/lib/gitlab/ci/config/entry/policy.rb
+++ b/lib/gitlab/ci/config/entry/policy.rb
@@ -65,7 +65,7 @@ module Gitlab
end
def value
- default.to_h.deep_merge(@subject.value.to_h)
+ default.to_h.deep_merge(subject.value.to_h)
end
end
end