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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index cb456f13d64c1bc1d0b715e204b6e3ae64a3f5bc..0d3f520a7cd0f17140a9689b92751ce8c05b3c21 100644 (file)
--- 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 45913bfae2ac471390b9286ae916e7cd9b8b5808..f7926a7aa6fdd21f85fe4708de1836a658a90fb5 100644 (file)
--- 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