diff options
author | Wild Kat <wk@users.noreply.github.com> | 2018-04-16 20:40:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-16 20:40:39 +0200 |
commit | 2e1717ec45d25b818f8ea10a5aa6d84f5d6947fc (patch) | |
tree | 3fc545ba2c256a98bdb04ec5946aafa122b27926 /lib/oxidized/manager.rb | |
parent | 140954f78e50bed1aaf3f8fd42f849e3892e55c0 (diff) | |
parent | b29550ce0cfaf6192652747d340da2dc777ac22b (diff) |
Merge branch 'master' into refactor-slackdiff
Diffstat (limited to 'lib/oxidized/manager.rb')
-rw-r--r-- | lib/oxidized/manager.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/oxidized/manager.rb b/lib/oxidized/manager.rb index bf28ae7..d2ef4d2 100644 --- a/lib/oxidized/manager.rb +++ b/lib/oxidized/manager.rb @@ -49,13 +49,13 @@ module Oxidized @model.merge! _model end def add_source _source - return nil if @source.key? _source + return nil if @source.has_key? _source _source = Manager.load Config::SourceDir, _source return false if _source.empty? @source.merge! _source end def add_hook _hook - return nil if @hook.key? _hook + return nil if @hook.has_key? _hook name = _hook _hook = Manager.load File.join(Config::Root, 'hook'), name _hook = Manager.load Config::HookDir, name if _hook.empty? |