Commit bce962a8 authored by Douwe Maan's avatar Douwe Maan

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

Remove `www.` from `twitter_url` helper

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