diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-13 16:07:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 16:07:40 +0100 |
| commit | ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (patch) | |
| tree | 14bcdbeac5f8d904cad3d13a469869c5baf9db99 /app/models/domain_block.rb | |
| parent | 180f1383943ad171d8394ef9af7c7861bfc08056 (diff) | |
| parent | 83f8bf48d91605fa63325b4d4acec717031da025 (diff) | |
Merge pull request #1263 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/domain_block.rb')
| -rw-r--r-- | app/models/domain_block.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb index 4e865b850..f0a5bd296 100644 --- a/app/models/domain_block.rb +++ b/app/models/domain_block.rb @@ -54,7 +54,7 @@ class DomainBlock < ApplicationRecord segments = uri.normalized_host.split('.') variants = segments.map.with_index { |_, i| segments[i..-1].join('.') } - where(domain: variants[0..-2]).order(Arel.sql('char_length(domain) desc')).first + where(domain: variants).order(Arel.sql('char_length(domain) desc')).first end end |