Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix specs on ruby 2.6.x #1316

Merged
merged 2 commits into from Jul 24, 2018
Merged

Fix specs on ruby 2.6.x #1316

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2b960a
Ruby 2.6.x compatibility: uri.host may be the empty string instead of…
rud Jul 24, 2018
46251b9
Notice: extract UI text into constant
rud Jul 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/models/notice.rb
View file
Open in desktop
@@ -1,6 +1,7 @@
require 'recurse'

class Notice
UNAVAILABLE = 'N/A'
MESSAGE_LENGTH_LIMIT = 1000

include Mongoid::Document
Expand Down Expand Up @@ -47,7 +48,7 @@ def user_agent

def user_agent_string
if user_agent.nil? || user_agent.none?
"N/A"
UNAVAILABLE
else
"#{user_agent.browser} #{user_agent.version} (#{user_agent.os})"
end
Expand Down Expand Up @@ -82,9 +83,10 @@ def url

def host
uri = url && URI.parse(url)
uri && uri.host || "N/A"
return uri.host if uri && uri.host.present?
UNAVAILABLE
rescue URI::InvalidURIError
"N/A"
UNAVAILABLE
end

def env_vars
Expand Down