summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-07-05 13:53:17 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-07-05 13:53:17 +0000
commitcb3edf00a533c0fb12391058e26a6e4eb0f846f3 (patch)
tree9e714d8baefcba145a72c03024db071e0d5d3c88
parente67bc3637e4ab1a35f6d3fa643cbd3cd5e290110 (diff)
downloadredmine-cb3edf00a533c0fb12391058e26a6e4eb0f846f3.tar.gz
redmine-cb3edf00a533c0fb12391058e26a6e4eb0f846f3.zip
Use https links instead of http links in ApplicationHelper#avatar_edit_link and Redmine::Info class methods (#20243).
Patch by Mischa The Evil. git-svn-id: http://svn.redmine.org/redmine/trunk@14413 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/application_helper.rb2
-rw-r--r--lib/redmine/info.rb4
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