Merge branch 'backport-ee' into 'master'

Backport two commits from EE

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/110

See merge request !2424

app/services/merge_requests/merge_service.rb

@@ -44,7 +44,7 @@ module MergeRequests
     def after_merge
       MergeRequests::PostMergeService.new(project, current_user).execute(merge_request)
 
-      if params[:should_remove_source_branch]
+      if params[:should_remove_source_branch].present?
         DeleteBranchService.new(@merge_request.source_project, current_user).
           execute(merge_request.source_branch)
       end

lib/banzai/cross_project_reference.rb

-require 'banzai'
-
 module Banzai
   # Common methods for ReferenceFilters that support an optional cross-project
   # reference.

lib/banzai/filter.rb

 require 'active_support/core_ext/string/output_safety'
-require 'banzai'
 
 module Banzai
   module Filter

lib/banzai/filter/abstract_reference_filter.rb

-require 'banzai'
-
 module Banzai
   module Filter
     # Issues, Merge Requests, Snippets, Commits and Commit Ranges share

lib/banzai/filter/autolink_filter.rb

-require 'banzai'
 require 'html/pipeline/filter'
 require 'uri'
 

lib/banzai/filter/commit_range_reference_filter.rb

-require 'banzai'
-
 module Banzai
   module Filter
     # HTML filter that replaces commit range references with links.

lib/banzai/filter/commit_reference_filter.rb

-require 'banzai'
-
 module Banzai
   module Filter
     # HTML filter that replaces commit references with links.

lib/banzai/filter/emoji_filter.rb

 require 'action_controller'
-require 'banzai'
 require 'gitlab_emoji'
 require 'html/pipeline/filter'
 

lib/banzai/filter/external_issue_reference_filter.rb

-require 'banzai'
-
 module Banzai
   module Filter
     # HTML filter that replaces external issue tracker references with links.

lib/banzai/filter/external_link_filter.rb

-require 'banzai'
 require 'html/pipeline/filter'
 
 module Banzai

lib/banzai/filter/issue_reference_filter.rb

-require 'banzai'
-
 module Banzai
   module Filter
     # HTML filter that replaces issue references with links. References to

lib/banzai/filter/label_reference_filter.rb

-require 'banzai'
-
 module Banzai
   module Filter
     # HTML filter that replaces label references with links.

lib/banzai/filter/markdown_filter.rb

-require 'banzai'
 require 'html/pipeline/filter'
 
 module Banzai

lib/banzai/filter/merge_request_reference_filter.rb

-require 'banzai'
-
 module Banzai
   module Filter
     # HTML filter that replaces merge request references with links. References

lib/banzai/filter/redactor_filter.rb

-require 'banzai'
 require 'html/pipeline/filter'
 
 module Banzai

lib/banzai/filter/reference_filter.rb

 require 'active_support/core_ext/string/output_safety'
-require 'banzai'
 require 'html/pipeline/filter'
 
 module Banzai

lib/banzai/filter/reference_gatherer_filter.rb

-require 'banzai'
 require 'html/pipeline/filter'
 
 module Banzai

lib/banzai/filter/relative_link_filter.rb

-require 'banzai'
 require 'html/pipeline/filter'
 require 'uri'
 

lib/banzai/filter/sanitization_filter.rb

-require 'banzai'
 require 'html/pipeline/filter'
 require 'html/pipeline/sanitization_filter'
 

lib/banzai/filter/snippet_reference_filter.rb

-require 'banzai'
-
 module Banzai
   module Filter
     # HTML filter that replaces snippet references with links. References to

lib/banzai/filter/syntax_highlight_filter.rb

-require 'banzai'
 require 'html/pipeline/filter'
 require 'rouge/plugins/redcarpet'
 

lib/banzai/filter/table_of_contents_filter.rb

-require 'banzai'
 require 'html/pipeline/filter'
 
 module Banzai

lib/banzai/filter/task_list_filter.rb

-require 'banzai'
 require 'task_list/filter'
 
 module Banzai

lib/banzai/filter/upload_link_filter.rb

-require 'banzai'
 require 'html/pipeline/filter'
 require 'uri'
 

lib/banzai/filter/user_reference_filter.rb

-require 'banzai'
-
 module Banzai
   module Filter
     # HTML filter that replaces user or group references with links.

lib/banzai/lazy_reference.rb

-require 'banzai'
-
 module Banzai
   class LazyReference
     def self.load(refs)

lib/banzai/pipeline.rb

-require 'banzai'
-
 module Banzai
   module Pipeline
     def self.[](name)

lib/banzai/pipeline/asciidoc_pipeline.rb

-require 'banzai'
-
 module Banzai
   module Pipeline
     class AsciidocPipeline < BasePipeline

lib/banzai/pipeline/atom_pipeline.rb

-require 'banzai'
-
 module Banzai
   module Pipeline
     class AtomPipeline < FullPipeline

lib/banzai/pipeline/base_pipeline.rb

-require 'banzai'
 require 'html/pipeline'
 
 module Banzai

lib/banzai/pipeline/combined_pipeline.rb

-require 'banzai'
-
 module Banzai
   module Pipeline
     module CombinedPipeline

lib/banzai/pipeline/description_pipeline.rb

-require 'banzai'
-
 module Banzai
   module Pipeline
     class DescriptionPipeline < FullPipeline

lib/banzai/pipeline/email_pipeline.rb

-require 'banzai'
-
 module Banzai
   module Pipeline
     class EmailPipeline < FullPipeline

lib/banzai/pipeline/full_pipeline.rb

-require 'banzai'
-
 module Banzai
   module Pipeline
     class FullPipeline < CombinedPipeline.new(PlainMarkdownPipeline, GfmPipeline)

lib/banzai/pipeline/gfm_pipeline.rb

-require 'banzai'
-
 module Banzai
   module Pipeline
     class GfmPipeline < BasePipeline

lib/banzai/pipeline/note_pipeline.rb

-require 'banzai'
-
 module Banzai
   module Pipeline
     class NotePipeline < FullPipeline

lib/banzai/pipeline/plain_markdown_pipeline.rb

-require 'banzai'
-
 module Banzai
   module Pipeline
     class PlainMarkdownPipeline < BasePipeline

lib/banzai/pipeline/post_process_pipeline.rb

-require 'banzai'
-
 module Banzai
   module Pipeline
     class PostProcessPipeline < BasePipeline

lib/banzai/pipeline/reference_extraction_pipeline.rb

-require 'banzai'
-
 module Banzai
   module Pipeline
     class ReferenceExtractionPipeline < BasePipeline

lib/banzai/pipeline/single_line_pipeline.rb

-require 'banzai'
-
 module Banzai
   module Pipeline
     class SingleLinePipeline < GfmPipeline

lib/banzai/reference_extractor.rb

-require 'banzai'
-
 module Banzai
   # Extract possible GFM references from an arbitrary String for further processing.
   class ReferenceExtractor

lib/gitlab/markdown/pipeline.rb

-require 'banzai'
-
 module Gitlab
   module Markdown
     class Pipeline

lib/gitlab/reference_extractor.rb

-require 'banzai'
-
 module Gitlab
   # Extract possible GFM references from an arbitrary String for further processing.
   class ReferenceExtractor < Banzai::ReferenceExtractor