Merge branch 'master' into glitch-soc/merge-upstream

2019-11-23 19:03:01 +01:00
parent 55f5e81a9d 054ef83fc5
commit c0f7e21685
10 changed files with 36 additions and 18 deletions
--- a/app/helpers/domain_control_helper.rb
+++ b/app/helpers/domain_control_helper.rb
@@ -6,7 +6,7 @@ module DomainControlHelper

    domain = begin
      if uri_or_domain.include?('://')
-        Addressable::URI.parse(uri_or_domain).domain
+        Addressable::URI.parse(uri_or_domain).host
      else
        uri_or_domain
      end