diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-11 23:17:11 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-11 23:17:11 +0000 |
| commit | e9052ceaafff786590fb66bee4550878cfb5a0df (patch) | |
| tree | fa95aed6a9c35752bf4e6f729fae902bda44e50f /config/initializers | |
| parent | 5ffa6f0fa12f5711e96b861c9813f3ec53bac3ee (diff) | |
| parent | 6ef3874b2eac79cc2b602de609793254b8d6c611 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/chewy.rb | 3 | ||||
| -rw-r--r-- | config/initializers/twitter_regex.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb index bef2746ec..702f7516c 100644 --- a/config/initializers/chewy.rb +++ b/config/initializers/chewy.rb @@ -11,7 +11,8 @@ Chewy.settings = { journal: false, } -Chewy.root_strategy = enabled ? :sidekiq : :bypass +Chewy.root_strategy = enabled ? :sidekiq : :bypass +Chewy.request_strategy = enabled ? :sidekiq : :bypass module Chewy class << self diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb index e924fac22..7fa828300 100644 --- a/config/initializers/twitter_regex.rb +++ b/config/initializers/twitter_regex.rb @@ -2,7 +2,7 @@ module Twitter class Regex REGEXEN[:valid_general_url_path_chars] = /[^\p{White_Space}\(\)\?]/iou - REGEXEN[:valid_url_path_ending_chars] = /[^\p{White_Space}\(\)\?!\*';:=\,\.\$%\[\]\p{Pd}~&\|@]|(?:#{REGEXEN[:valid_url_balanced_parens]})/iou + REGEXEN[:valid_url_path_ending_chars] = /[^\p{White_Space}\(\)\?!\*';:=\,\.\$%\[\]~&\|@]|(?:#{REGEXEN[:valid_url_balanced_parens]})/iou REGEXEN[:valid_url_balanced_parens] = / \( (?: |