##// END OF EJS Templates
Merged r14413 from trunk to 3.1-stable (#20243, #20456)...
Toshi MARUYAMA -
r14156:6ad6dd2b35aa
parent child
Show More
@@ -1254,7 +1254,7 module ApplicationHelper
1254 1254 # Returns a link to edit user's avatar if avatars are enabled
1255 1255 def avatar_edit_link(user, options={})
1256 1256 if Setting.gravatar_enabled?
1257 url = "http://gravatar.com"
1257 url = "https://gravatar.com"
1258 1258 link_to avatar(user, {:title => l(:button_edit)}.merge(options)), url, :target => '_blank'
1259 1259 end
1260 1260 end
@@ -2,8 +2,8 module Redmine
2 2 module Info
3 3 class << self
4 4 def app_name; 'Redmine' end
5 def url; 'http://www.redmine.org/' end
6 def help_url; 'http://www.redmine.org/guide' end
5 def url; 'https://www.redmine.org/' end
6 def help_url; 'https://www.redmine.org/guide' end
7 7 def versioned_name; "#{app_name} #{Redmine::VERSION}" end
8 8
9 9 def environment
General Comments 0
You need to be logged in to leave comments. Login now