diff --git a/app/controllers/admin/stylesheets_controller.rb b/app/controllers/admin/stylesheets_controller.rb index f5b94e200..9c6812556 100644 --- a/app/controllers/admin/stylesheets_controller.rb +++ b/app/controllers/admin/stylesheets_controller.rb @@ -6,7 +6,7 @@ def show def create Stylesheet.temporary(current_account, params[:url]) do - redirect_to "/" + Stylesheet.capture("http://#{MY_DOMAIN}/", cookies) + redirect_to "/" + Stylesheet.capture("https://#{MY_DOMAIN}/", cookies) end end diff --git a/app/helpers/atom_helper.rb b/app/helpers/atom_helper.rb index 9a4e26e7f..fcf088c18 100644 --- a/app/helpers/atom_helper.rb +++ b/app/helpers/atom_helper.rb @@ -5,7 +5,7 @@ def atom_comments_link(content, url) str = <<-EOS
Commentaires : - voir le flux Atom + voir le flux Atom ouvrir dans le navigateur
EOS diff --git a/app/models/image.rb b/app/models/image.rb index 0da45e59c..b47cb17c2 100644 --- a/app/models/image.rb +++ b/app/models/image.rb @@ -69,7 +69,7 @@ def src(type="img") return link if internal_link? return E403 if blacklisted? register_in_redis - "//#{IMG_DOMAIN}/#{type}/#{encoded_link}/#{filename}" + "https://#{IMG_DOMAIN}/#{type}/#{encoded_link}/#{filename}" end def src_attr diff --git a/app/models/user.rb b/app/models/user.rb index 7a65c9d84..708c6d1a6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -89,7 +89,7 @@ def custom_avatar_url=(url) before_validation :validate_url def validate_url return if custom_avatar_url.blank? - return if custom_avatar_url.starts_with?("//") + return if custom_avatar_url.starts_with?("https://") errors.add(:url, "Adresse de téléchargement d’avatar non valide") end diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb index 5d7228655..98c64d146 100644 --- a/app/uploaders/avatar_uploader.rb +++ b/app/uploaders/avatar_uploader.rb @@ -3,7 +3,7 @@ class AvatarUploader < CarrierWave::Uploader::Base AVATAR_SIZE = 64 - DEFAULT_AVATAR_URL = "//#{MY_DOMAIN}/images/default-avatar.svg" + DEFAULT_AVATAR_URL = "https://#{MY_DOMAIN}/images/default-avatar.svg" include CarrierWave::MiniMagick process resize_and_pad: [AVATAR_SIZE, AVATAR_SIZE] @@ -13,7 +13,7 @@ def base_dir end def url - super.sub(base_dir.to_s, "//#{IMG_DOMAIN}") + super.sub(base_dir.to_s, "https://#{IMG_DOMAIN}") end def store_dir diff --git a/app/uploaders/stylesheet_uploader.rb b/app/uploaders/stylesheet_uploader.rb index 32fddaa9a..a265c5e79 100644 --- a/app/uploaders/stylesheet_uploader.rb +++ b/app/uploaders/stylesheet_uploader.rb @@ -6,7 +6,7 @@ def base_dir end def url - super.sub(base_dir.to_s, "//#{IMG_DOMAIN}") + super.sub(base_dir.to_s, "https://#{IMG_DOMAIN}") end def store_dir diff --git a/app/views/stylesheets/edit.html.haml b/app/views/stylesheets/edit.html.haml index 19fc17fe8..9983f3734 100644 --- a/app/views/stylesheets/edit.html.haml +++ b/app/views/stylesheets/edit.html.haml @@ -33,7 +33,7 @@ Pour cela, il vous suffit de commencer votre feuille de style par la déclaration suivante : %pre - @import url("//#{MY_DOMAIN}/assets/application.css"); + @import url("https://#{MY_DOMAIN}/assets/application.css"); %div.sideforms = form_tag "/stylesheet", method: :put do