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-14 16:41:12 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-01-14 16:41:12 +0300
commit0ea8c236c15eea3bd08f7cdd0e6d0cc4e82faef5 (patch)
tree276740c86392a15528b50388e8cfc72a96c49230 /lib/gitlab/ci
parent67e90a123f4086b9110f081b204be2250459bbc7 (diff)
Add more specs for only/except policy config entry
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 fae6deede8b..bd571b8ea83 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
- self.class.default(key: @key).yield_self do |default|
+ self.class.default(key: @subject.key).yield_self do |default|
default.to_h.deep_merge(@subject.value.to_h)
end
end