From 317a9df685d9c2db372ae4b78e615eac13398f59 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Fri, 8 Oct 2021 12:05:31 +0200
Subject: [PATCH] favicon and ssl

---
 app/views/layouts/application.html.erb | 1 +
 app/views/layouts/devise.html.erb      | 1 +
 config/environments/production.rb      | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 72922a729..5726df05b 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -8,6 +8,7 @@
     <%= csp_meta_tag %>
     <%= stylesheet_link_tag 'application', media: 'all' %>
     <%= javascript_include_tag 'application' %>
+    <%= favicon_link_tag 'favicon.png' %>
   </head>
   <body>
     <%= render 'nav' %>
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index 428f9850e..bf0769f90 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -8,6 +8,7 @@
     <%= csp_meta_tag %>
     <%= stylesheet_link_tag 'admin', media: 'all' %>
     <%= javascript_include_tag 'admin' %>
+    <%= favicon_link_tag 'favicon.png' %>
   </head>
   <body data-theme="default" data-layout="fluid">
     <div class="main d-flex justify-content-center w-100">
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 2ff61f147..11d9626ff 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -41,7 +41,7 @@ Rails.application.configure do
   config.active_storage.service = :amazon
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
+  config.force_ssl = true
 
   # Include generic and useful information about system operation, but avoid logging too much
   # information to avoid inadvertent exposure of personally identifiable information (PII).
-- 
GitLab