From 555cb2d69e3e1eda0bbada75cb4a2b08634cc566 Mon Sep 17 00:00:00 2001
From: Michael Kohl <citizen428@gmail.com>
Date: Sat, 7 Mar 2020 04:35:35 +0700
Subject: [PATCH] Consistently use cache_key_heroku_slug (#6495)

---
 app/views/articles/_sidebar.html.erb       | 2 +-
 app/views/feedback_messages/index.html.erb | 2 +-
 app/views/moderations/mod.html.erb         | 2 +-
 app/views/pages/live.html.erb              | 2 +-
 app/views/pages/onboarding.html.erb        | 2 +-
 app/views/partnerships/index.html.erb      | 2 +-
 app/views/partnerships/show.html.erb       | 2 +-
 app/views/pro_memberships/show.html.erb    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/articles/_sidebar.html.erb b/app/views/articles/_sidebar.html.erb
index d74ed2a4c..ccfb74d8f 100644
--- a/app/views/articles/_sidebar.html.erb
+++ b/app/views/articles/_sidebar.html.erb
@@ -1,7 +1,7 @@
 <div id="sidebar-wrapper-left" class="sidebar-wrapper sidebar-wrapper-left">
   <div class="sidebar-bg" id="sidebar-bg-left"></div>
   <div class="side-bar">
-    <% cache("main-sidebar-nav--#{user_signed_in?}-#{ApplicationConfig['HEROKU_SLUG_COMMIT']}", expires_in: 5.days) do %>
+    <% cache(cache_key_heroku_slug("main-sidebar-nav--#{user_signed_in?}"), expires_in: 5.days) do %>
       <%= render "articles/sidebar_nav" %>
       <div class="widget widget-sponsorship <%= "showing" unless user_signed_in? %>" id="sponsorship-widget">
         <header>
diff --git a/app/views/feedback_messages/index.html.erb b/app/views/feedback_messages/index.html.erb
index 6e6263818..edaf1cf6f 100644
--- a/app/views/feedback_messages/index.html.erb
+++ b/app/views/feedback_messages/index.html.erb
@@ -1,5 +1,5 @@
 <% title "Feedback" %>
-<% cache "feedback-messages-lander-styling-#{ApplicationConfig['HEROKU_SLUG_COMMIT']}" do %>
+<% cache(cache_key_heroku_slug("feedback-messages-lander-styling")) do %>
   <style>
     <%= Rails.application.assets["feedback_messages.css"].to_s.html_safe %>
   </style>
diff --git a/app/views/moderations/mod.html.erb b/app/views/moderations/mod.html.erb
index aa0f922e9..289e2853c 100644
--- a/app/views/moderations/mod.html.erb
+++ b/app/views/moderations/mod.html.erb
@@ -1,6 +1,6 @@
 <% title "[Moderate] " + @moderatable.title %>
 
-<% cache "mod-styling-#{ApplicationConfig['HEROKU_SLUG_COMMIT']}" do %>
+<% cache(cache_key_heroku_slug("mod-styling")) do %>
   <style>
     <%= Rails.application.assets["moderators.css"].to_s.html_safe %>
   </style>
diff --git a/app/views/pages/live.html.erb b/app/views/pages/live.html.erb
index 725d29588..7d3da1499 100644
--- a/app/views/pages/live.html.erb
+++ b/app/views/pages/live.html.erb
@@ -20,7 +20,7 @@
 <meta name="twitter:image:src" content="https://thepracticaldev.s3.amazonaws.com/i/bqzj1pwho9e0jicqo44s.png">
 
 <style>
-  <% cache "live-page-css-#{ApplicationConfig['HEROKU_SLUG_COMMIT']}", expires_in: 1.hour do %>
+  <% cache(cache_key_heroku_slug("live-page-css"), expires_in: 1.hour) do %>
   <%= Rails.application.assets["live.css"].to_s.html_safe %>
   <% end %>
 </style>
diff --git a/app/views/pages/onboarding.html.erb b/app/views/pages/onboarding.html.erb
index c97e61e15..99a9076bd 100644
--- a/app/views/pages/onboarding.html.erb
+++ b/app/views/pages/onboarding.html.erb
@@ -1,7 +1,7 @@
 <% title "Welcome to #{ApplicationConfig['COMMUNITY_NAME']}" %>
 
 <style>
-  <% cache "onboarding-css-#{ApplicationConfig['HEROKU_SLUG_COMMIT']}", expires_in: 10.hours do %>
+  <% cache(cache_key_heroku_slug("onboarding-css"), expires_in: 10.hours) do %>
     <%= Rails.application.assets["onboarding.css"].to_s.html_safe %>
     <%= Rails.application.assets["preact/onboarding-modal.css"].to_s.html_safe %>
   <% end %>
diff --git a/app/views/partnerships/index.html.erb b/app/views/partnerships/index.html.erb
index d16110eb3..4bd1c2425 100644
--- a/app/views/partnerships/index.html.erb
+++ b/app/views/partnerships/index.html.erb
@@ -1,7 +1,7 @@
 <% title "Partnerships and Sponsors" %>
 
 <style>
-  <% cache "partnership-org-section-credits-#{ApplicationConfig['HEROKU_SLUG_COMMIT']}", expires_in: 10.hours do %>
+  <% cache(cache_key_heroku_slug("partnership-org-section-credits"), expires_in: 10.hours) do %>
     <%= Rails.application.assets["partnerships.css"].to_s.html_safe %>
   <% end %>
 </style>
diff --git a/app/views/partnerships/show.html.erb b/app/views/partnerships/show.html.erb
index 5cd7755ac..156bebfe1 100644
--- a/app/views/partnerships/show.html.erb
+++ b/app/views/partnerships/show.html.erb
@@ -1,7 +1,7 @@
 <% title "#{params[:option].titleize} Overview" %>
 
 <style>
-  <% cache "partnership-org-section-credits-#{ApplicationConfig['HEROKU_SLUG_COMMIT']}", expires_in: 10.hours do %>
+  <% cache(cache_key_heroku_slug("partnership-org-section-credits"), expires_in: 10.hours) do %>
     <%= Rails.application.assets["partnerships.css"].to_s.html_safe %>
   <% end %>
 </style>
diff --git a/app/views/pro_memberships/show.html.erb b/app/views/pro_memberships/show.html.erb
index 6ebcb2234..098961e15 100644
--- a/app/views/pro_memberships/show.html.erb
+++ b/app/views/pro_memberships/show.html.erb
@@ -1,7 +1,7 @@
 <% title "Pro Membership" %>
 
 <style>
-  <% cache "partnership-org-section-credits-#{ApplicationConfig['HEROKU_SLUG_COMMIT']}", expires_in: 10.hours do %>
+  <% cache(cache_key_heroku_slug("partnership-org-section-credits"), expires_in: 10.hours) do %>
     <%= Rails.application.assets["partnerships.css"].to_s.html_safe %>
   <% end %>
 </style>