diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-02-02 21:40:01 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-02-02 21:40:01 +0000 |
| commit | b47933f858a25ba29ece419ca70b7a286adf2a80 (patch) | |
| tree | 9ec0aadae79bae479a2ca292820a2515ac01af22 | |
| parent | a00aed74af67dd72a2aa7bf7e485ff7bdb949ea4 (diff) | |
| parent | fac2047c091a9dfb08e98aea17b0b6bf6b124969 (diff) | |
| download | gitlab-ce-b47933f858a25ba29ece419ca70b7a286adf2a80.tar.gz | |
Merge branch '42729-rubocop-regular-expression-check-is-breaking-master' into 'master'
Resolve "Rubocop regular expression check is breaking master"
Closes #42729
See merge request gitlab-org/gitlab-ce!16898
| -rw-r--r-- | lib/banzai/color_parser.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/banzai/color_parser.rb b/lib/banzai/color_parser.rb index 0cd9085190c..355c364b07b 100644 --- a/lib/banzai/color_parser.rb +++ b/lib/banzai/color_parser.rb @@ -7,7 +7,7 @@ module Banzai DEGS = /-?\d+(?:deg)?/i # [-]digits[deg] RADS = /-?(?:\d+(?:\.\d+)?|\.\d+)rad/i # [-](digits[.digits] OR .digits)rad HEX_FORMAT = /\#(?:\h{3}|\h{4}|\h{6}|\h{8})/ - RGB_FORMAT = / + RGB_FORMAT = %r{ (?:rgba? \( (?: @@ -18,15 +18,15 @@ module Banzai #{ALPHA_CHANNEL} \) ) - /xi - HSL_FORMAT = / + }xi + HSL_FORMAT = %r{ (?:hsla? \( (?:#{DEGS}|#{RADS}),\s*#{PERCENTS},\s*#{PERCENTS} #{ALPHA_CHANNEL} \) ) - /xi + }xi FORMATS = [HEX_FORMAT, RGB_FORMAT, HSL_FORMAT].freeze |