Merge branch…

Merge branch '41041-undefined-method-new_project_guidelines_html-unable-to-load-from-cache' into 'master' Resolve "undefined method `new_project_guidelines_html', unable to load from cache" Closes #41041 See merge request gitlab-org/gitlab-ce!15878 (cherry picked from commit 2750d7e6) 3b860069 Clears the current Appearance cache otherwise it breaks since…

Merge branch…
2886bdce · Douwe Maan · LUKE BENNETT · 2a6a3737 · 2886bdce
Commit 2886bdce authored Dec 12, 2017 by Douwe Maan Committed by LUKE BENNETT Dec 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

20171122131600_add_new_project_guidelines_to_appearances.rb ...171122131600_add_new_project_guidelines_to_appearances.rb +6 -0

No files found.
--- a/db/migrate/20171122131600_add_new_project_guidelines_to_appearances.rb
+++ b/db/migrate/20171122131600_add_new_project_guidelines_to_appearances.rb
@@ -4,6 +4,12 @@ class AddNewProjectGuidelinesToAppearances < ActiveRecord::Migration
  DOWNTIME = false

  def change
+    # Clears the current Appearance cache otherwise it breaks since
+    # new_project_guidelines_html would be missing. See
+    # https://gitlab.com/gitlab-org/gitlab-ce/issues/41041
+    # We're not using Appearance#flush_redis_cache on purpose here.
+    Rails.cache.delete('current_appearance')
+
    change_table :appearances do |t|
      t.text :new_project_guidelines
      t.text :new_project_guidelines_html