diff options
| author | Jacopo <beschi.jacopo@gmail.com> | 2017-11-14 12:02:39 +0300 |
|---|---|---|
| committer | Jacopo <beschi.jacopo@gmail.com> | 2017-11-16 19:58:29 +0300 |
| commit | 181cd299f9e06223e8338e93b1c318c671ccb1aa (patch) | |
| tree | 0d71dcf3f786496eaa46b9d65ce2626f162015da /lib/gitlab/ci/config | |
| parent | f2997af4d5cdec3266d3178edeedc36d4e590062 (diff) | |
Adds Rubocop rule for line break after guard clause
Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
Diffstat (limited to 'lib/gitlab/ci/config')
| -rw-r--r-- | lib/gitlab/ci/config/entry/image.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/ci/config/entry/validators.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/ci/config/entry/image.rb b/lib/gitlab/ci/config/entry/image.rb index 6555c589173..2844be80a84 100644 --- a/lib/gitlab/ci/config/entry/image.rb +++ b/lib/gitlab/ci/config/entry/image.rb @@ -37,6 +37,7 @@ module Gitlab def value return { name: @config } if string? return @config if hash? + {} end end diff --git a/lib/gitlab/ci/config/entry/validators.rb b/lib/gitlab/ci/config/entry/validators.rb index 0159179f0a9..eb606b57667 100644 --- a/lib/gitlab/ci/config/entry/validators.rb +++ b/lib/gitlab/ci/config/entry/validators.rb @@ -111,6 +111,7 @@ module Gitlab def validate_string_or_regexp(value) return false unless value.is_a?(String) return validate_regexp(value) if look_like_regexp?(value) + true end end |