github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 00:17:17 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Enable Lint/ShadowingOuterLocalVariable for Rubocop.

Browse Source
This commit is contained in:
Guo Xiang Tan
2018-09-04 10:16:21 +08:00
parent 2f5c21e28c
commit 8dc1463ab3
16 changed files with 70 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/final_destination.rb
View File

@ -38,10 +38,17 @@ class FinalDestination
@opts[:lookup_ip] ||= lambda { |host| FinalDestination.lookup_ip(host) }
@ignored = @opts[:ignore_hostnames] || []
[Discourse.base_url_no_prefix].concat(@opts[:ignore_redirects] || []).each do |url|
url = uri(url)
if url.present? && url.hostname
@ignored << url.hostname
ignore_redirects = [Discourse.base_url_no_prefix]
if @opts[:ignore_redirects]
ignore_redirects.concat(@opts[:ignore_redirects])
end
ignore_redirects.each do |ignore_redirect|
ignore_redirect = uri(ignore_redirect)
if ignore_redirect.present? && ignore_redirect.hostname
@ignored << ignore_redirect.hostname
end
end