diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-20 08:43:37 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-20 08:43:37 +0000 |
| commit | bce962a87c9aa76b63f96b1c7ce302ba233ea68e (patch) | |
| tree | fa077faf4c2553990c14f7b6f8bd87710dab33e7 | |
| parent | 5f6754185fc8bca6bb510a0aa17410dbffa293ff (diff) | |
| parent | e118487c2a9f86ffd6c23e1f709662314b1284b6 (diff) | |
| download | gitlab-ce-bce962a87c9aa76b63f96b1c7ce302ba233ea68e.tar.gz | |
Merge branch 'rs-twitter-helper' into 'master'
Remove `www.` from `twitter_url` helper
See merge request gitlab-org/gitlab-ce!17872
| -rw-r--r-- | app/helpers/application_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index af9c8bf1bd3..3ddf8eb3369 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -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}" @@ -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 |