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

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