about summary refs log tree commit diff
path: root/config/initializers
diff options
context:
space:
mode:
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/timeout.rb6
-rw-r--r--config/initializers/twitter_regex.rb2
2 files changed, 1 insertions, 7 deletions
diff --git a/config/initializers/timeout.rb b/config/initializers/timeout.rb
deleted file mode 100644
index de87fd906..000000000
--- a/config/initializers/timeout.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-Rack::Timeout::Logger.disable
-Rack::Timeout.service_timeout = false
-
-if Rails.env.production?
-  Rack::Timeout.service_timeout = 90
-end
diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb
index 7fa828300..c227f92d3 100644
--- a/config/initializers/twitter_regex.rb
+++ b/config/initializers/twitter_regex.rb
@@ -30,7 +30,7 @@ module Twitter
       (                                                                                     #   $1 total match
         (#{REGEXEN[:valid_url_preceding_chars]})                                            #   $2 Preceeding chracter
         (                                                                                   #   $3 URL
-          (https?:\/\/)?                                                                    #   $4 Protocol (optional)
+          ((https?|dat|dweb|ipfs|ipns|ssb|gopher):\/\/)?                                    #   $4 Protocol (optional)
           (#{REGEXEN[:valid_domain]})                                                       #   $5 Domain(s)
           (?::(#{REGEXEN[:valid_port_number]}))?                                            #   $6 Port number (optional)
           (/#{REGEXEN[:valid_url_path]}*)?                                                  #   $7 URL Path and anchor