diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-07 17:40:46 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-07 17:40:46 -0600 |
| commit | c1c74e608625eab143f44ef6940e64cca6af0a0c (patch) | |
| tree | c5ca4a8a39946f54878a3ecde6b4adcda11d2d9b /lib/banzai/filter/emoji_filter.rb | |
| parent | cecea7529fb37893af6bf514a53e239a3be1eea6 (diff) | |
| parent | 8900b23eab6abd5a6c01278fa0da18d5bed98491 (diff) | |
| download | gitlab-ce-c1c74e608625eab143f44ef6940e64cca6af0a0c.tar.gz | |
Merge branch 'master' into fix-no-template
Diffstat (limited to 'lib/banzai/filter/emoji_filter.rb')
| -rw-r--r-- | lib/banzai/filter/emoji_filter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/banzai/filter/emoji_filter.rb b/lib/banzai/filter/emoji_filter.rb index 6255a611dbe..b82c6ca6393 100644 --- a/lib/banzai/filter/emoji_filter.rb +++ b/lib/banzai/filter/emoji_filter.rb @@ -54,9 +54,9 @@ module Banzai # Build a regexp that matches all valid :emoji: names. def self.emoji_pattern @emoji_pattern ||= - /(?<=[^[:alnum:]:]|\n|^) + %r{(?<=[^[:alnum:]:]|\n|^) :(#{Gitlab::Emoji.emojis_names.map { |name| Regexp.escape(name) }.join('|')}): - (?=[^[:alnum:]:]|$)/x + (?=[^[:alnum:]:]|$)}x end # Build a regexp that matches all valid unicode emojis names. |