Skip to content
Snippets Groups Projects
Commit bce962a8 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'rs-twitter-helper' into 'master'

Remove `www.` from `twitter_url` helper

See merge request gitlab-org/gitlab-ce!17872
parents 5f675418 e118487c
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -300,7 +300,7 @@ module ApplicationHelper
 
def linkedin_url(user)
name = user.linkedin
if name =~ %r{\Ahttps?:\/\/(www\.)?linkedin\.com\/in\/}
if name =~ %r{\Ahttps?://(www\.)?linkedin\.com/in/}
name
else
"https://www.linkedin.com/in/#{name}"
Loading
Loading
@@ -309,10 +309,10 @@ module ApplicationHelper
 
def twitter_url(user)
name = user.twitter
if name =~ %r{\Ahttps?:\/\/(www\.)?twitter\.com\/}
if name =~ %r{\Ahttps?://(www\.)?twitter\.com/}
name
else
"https://www.twitter.com/#{name}"
"https://twitter.com/#{name}"
end
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment