diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-22 20:46:57 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 18:32:41 +0300 |
| commit | 7d4b52b27dcbe30d85d4fad27e983cee51cf6677 (patch) | |
| tree | e7320b078fcb04b73ab9f9bfc50b7a9efc672239 /lib/gitlab | |
| parent | eacae00516ffe534f197eeca20655cbc0fdf5694 (diff) | |
Enable Style/WordArray
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/template/gitlab_ci_yml_template.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/url_sanitizer.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/template/gitlab_ci_yml_template.rb b/lib/gitlab/template/gitlab_ci_yml_template.rb index 9d2ecee9756..fd040148a1e 100644 --- a/lib/gitlab/template/gitlab_ci_yml_template.rb +++ b/lib/gitlab/template/gitlab_ci_yml_template.rb @@ -28,7 +28,7 @@ module Gitlab end def dropdown_names(context) - categories = context == 'autodeploy' ? ['Auto deploy'] : ['General', 'Pages'] + categories = context == 'autodeploy' ? ['Auto deploy'] : %w(General Pages) super().slice(*categories) end end diff --git a/lib/gitlab/url_sanitizer.rb b/lib/gitlab/url_sanitizer.rb index 19dad699edf..1f0d96088cf 100644 --- a/lib/gitlab/url_sanitizer.rb +++ b/lib/gitlab/url_sanitizer.rb @@ -1,7 +1,7 @@ module Gitlab class UrlSanitizer def self.sanitize(content) - regexp = URI::Parser.new.make_regexp(['http', 'https', 'ssh', 'git']) + regexp = URI::Parser.new.make_regexp(%w(http https ssh git)) content.gsub(regexp) { |url| new(url).masked_url } rescue Addressable::URI::InvalidURIError |