diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-07-12 14:40:51 +0200 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-07-12 14:40:51 +0200 |
commit | 61f7bede79a006c7b44e88a3385d175c5ad2a863 (patch) | |
tree | 921ab2d7f18a4bf3147288c9b922836e078d7b08 /lib | |
parent | 06641a3fee4ebdaada3007a51866a7fb927d21de (diff) | |
download | gitlab-ce-61f7bede79a006c7b44e88a3385d175c5ad2a863.tar.gz |
Fix using `try` on delegators in CI config entries
See:
https://github.com/rails/rails/commit/af53280a4b5b3323ac87dc60deb2b1b781197b2b
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ci/config/node/configurable.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ci/config/node/configurable.rb b/lib/gitlab/ci/config/node/configurable.rb index 29de2d7d0b5..da2ef4d5503 100644 --- a/lib/gitlab/ci/config/node/configurable.rb +++ b/lib/gitlab/ci/config/node/configurable.rb @@ -51,12 +51,12 @@ module Gitlab def helpers(*nodes) nodes.each do |symbol| define_method("#{symbol}_defined?") do - @entries[symbol].specified? + @entries[symbol].specified? if @entries[symbol] end define_method("#{symbol}_value") do raise Entry::InvalidError unless valid? - @entries[symbol].try(:value) + @entries[symbol].value if @entries[symbol] end alias_method symbol.to_sym, "#{symbol}_value".to_sym |