diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-08-31 05:22:59 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-08-31 05:22:59 +0000 |
| commit | 6ad6dd2b35aa3c521c06e150323dba38979e10a6 (patch) | |
| tree | bdc82db2c2e2d6d9e0881dc9e548b207f02bdd39 | |
| parent | 6ce8c55a5cf9ad043291ee5ec639e8a9e8a35c24 (diff) | |
| download | redmine-6ad6dd2b35aa3c521c06e150323dba38979e10a6.tar.gz redmine-6ad6dd2b35aa3c521c06e150323dba38979e10a6.zip | |
Merged r14413 from trunk to 3.1-stable (#20243, #20456)
Use https links instead of http links in ApplicationHelper#avatar_edit_link and Redmine::Info class methods.
Patch by Mischa The Evil.
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14538 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | lib/redmine/info.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cb456f13d..0d3f520a7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1254,7 +1254,7 @@ module ApplicationHelper # Returns a link to edit user's avatar if avatars are enabled def avatar_edit_link(user, options={}) if Setting.gravatar_enabled? - url = "http://gravatar.com" + url = "https://gravatar.com" link_to avatar(user, {:title => l(:button_edit)}.merge(options)), url, :target => '_blank' end end diff --git a/lib/redmine/info.rb b/lib/redmine/info.rb index 45913bfae..f7926a7aa 100644 --- a/lib/redmine/info.rb +++ b/lib/redmine/info.rb @@ -2,8 +2,8 @@ module Redmine module Info class << self def app_name; 'Redmine' end - def url; 'http://www.redmine.org/' end - def help_url; 'http://www.redmine.org/guide' end + def url; 'https://www.redmine.org/' end + def help_url; 'https://www.redmine.org/guide' end def versioned_name; "#{app_name} #{Redmine::VERSION}" end def environment |