Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-24

changelogs/unreleased/sh-revert-markdown-changes.yml

+---
+title: Fix slow Markdown rendering
+merge_request: 20820
+author:
+type: performance

doc/development/background_migrations.md

@@ -296,10 +296,18 @@ for more details.
 
 ## Best practices
 
+1. Make sure to know how much data you're dealing with
 1. Make sure that background migration jobs are idempotent.
 1. Make sure that tests you write are not false positives.
 1. Make sure that if the data being migrated is critical and cannot be lost, the
    clean-up migration also checks the final state of the data before completing.
+1. Make sure to know how much time it'll take to run all scheduled migrations
+1. When migrating many columns, make sure it won't generate too many
+   dead tuples in the process (you may need to directly query the number of dead tuples
+   and adjust the scheduling according to this piece of data)
+1. Make sure to discuss the numbers with a database specialist, the migration may add
+   more pressure on DB than you expect (measure on staging,
+   or ask someone to measure on production)
 
 [migrations-readme]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/spec/migrations/README.md
 [issue-rspec-hooks]: https://gitlab.com/gitlab-org/gitlab-ce/issues/35351

lib/banzai/filter/sanitization_filter.rb

@@ -13,7 +13,7 @@ module Banzai
 
       def whitelist
         strong_memoize(:whitelist) do
-          customize_whitelist(super.dup)
+          customize_whitelist(super.deep_dup)
         end
       end
 

spec/lib/banzai/filter/sanitization_filter_spec.rb

@@ -54,6 +54,18 @@ describe Banzai::Filter::SanitizationFilter do
       expect(instance.whitelist[:transformers].size).to eq control_count
     end
 
+    it 'customizes the whitelist only once for different instances' do
+      instance1 = described_class.new('Foo1')
+      instance2 = described_class.new('Foo2')
+      control_count = instance1.whitelist[:transformers].size
+
+      instance1.whitelist
+      instance2.whitelist
+
+      expect(instance1.whitelist[:transformers].size).to eq control_count
+      expect(instance2.whitelist[:transformers].size).to eq control_count
+    end
+
     it 'sanitizes `class` attribute from all elements' do
       act = %q{<pre class="code highlight white c"><code>&lt;span class="k"&gt;def&lt;/span&gt;</code></pre>}
       exp = %q{<pre><code>&lt;span class="k"&gt;def&lt;/span&gt;</code></pre>}

spec/lib/gitlab/background_migration/delete_diff_files_spec.rb

 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::DeleteDiffFiles, :migration, schema: 20180619121030 do
+describe Gitlab::BackgroundMigration::DeleteDiffFiles, :migration, :sidekiq, schema: 20180619121030 do
   describe '#perform' do
     context 'when diff files can be deleted' do
       let(:merge_request) { create(:merge_request, :merged) }

spec/lib/gitlab/background_migration/schedule_diff_files_deletion_spec.rb

 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::ScheduleDiffFilesDeletion, :migration, schema: 20180619121030 do
+describe Gitlab::BackgroundMigration::ScheduleDiffFilesDeletion, :migration, :sidekiq, schema: 20180619121030 do
   describe '#perform' do
     let(:merge_request_diffs) { table(:merge_request_diffs) }
     let(:merge_requests) { table(:merge_requests) }