diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-11-17 06:24:36 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-11-17 06:24:36 +0000 |
| commit | 03cb8edb34ab0d19049931434863b585d85de238 (patch) | |
| tree | 2fc729629cb1861bfedc0cb011e1610491606a9c /app | |
| parent | 0061143ccd2e37e7ff83bd85127e0638e5e40f85 (diff) | |
| parent | 3300db70ff53699732672824859186cd083623fa (diff) | |
| download | gitlab-ce-03cb8edb34ab0d19049931434863b585d85de238.tar.gz | |
Merge branch 'http-to-https' into 'master'
Rewrite HTTP links to force TLS, where possible
I got annoyed at the fact that the links on the profile page don't force the use of TLS, so I grepped through the entire source tree, tested all the links I found, and replaced them if possible.
See merge request !1806
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/users/_profile.html.haml | 4 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/users/_profile.html.haml b/app/views/admin/users/_profile.html.haml index 90d9980c85c..7d11edc79e2 100644 --- a/app/views/admin/users/_profile.html.haml +++ b/app/views/admin/users/_profile.html.haml @@ -16,11 +16,11 @@ - unless user.linkedin.blank? %li %span.light LinkedIn: - %strong= link_to user.linkedin, "http://www.linkedin.com/in/#{user.linkedin}" + %strong= link_to user.linkedin, "https://www.linkedin.com/in/#{user.linkedin}" - unless user.twitter.blank? %li %span.light Twitter: - %strong= link_to user.twitter, "http://www.twitter.com/#{user.twitter}" + %strong= link_to user.twitter, "https://twitter.com/#{user.twitter}" - unless user.website_url.blank? %li %span.light Website: diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 30992412184..d5a92cb816a 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -32,11 +32,11 @@ = icon('skype') - unless @user.linkedin.blank? .profile-link-holder - = link_to "http://www.linkedin.com/in/#{@user.linkedin}", title: "LinkedIn" do + = link_to "https://www.linkedin.com/in/#{@user.linkedin}", title: "LinkedIn" do = icon('linkedin-square') - unless @user.twitter.blank? .profile-link-holder - = link_to "http://www.twitter.com/#{@user.twitter}", title: "Twitter" do + = link_to "https://twitter.com/#{@user.twitter}", title: "Twitter" do = icon('twitter-square') - unless @user.website_url.blank? .profile-link-holder |