From ee2a9e0af0c91e4cc0d1c24acf35ff1eba1cc8db Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Fri, 29 Jun 2018 11:21:13 +0200
Subject: [PATCH] Remove unused asset host logic from GfmPipeline and
 EmojiFilter spec

---
 lib/banzai/pipeline/gfm_pipeline.rb         | 6 +-----
 spec/lib/banzai/filter/emoji_filter_spec.rb | 9 ---------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb
index a1f24e8b093..0d9b874ef85 100644
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
@@ -44,11 +44,7 @@ module Banzai
       def self.transform_context(context)
         context[:only_path] = true unless context.key?(:only_path)
 
-        context.merge(
-          # EmojiFilter
-          asset_host: Gitlab::Application.config.asset_host,
-          asset_root: Gitlab.config.gitlab.base_url
-        )
+        context
       end
     end
   end
diff --git a/spec/lib/banzai/filter/emoji_filter_spec.rb b/spec/lib/banzai/filter/emoji_filter_spec.rb
index 10910f22d4a..85a4619e33d 100644
--- a/spec/lib/banzai/filter/emoji_filter_spec.rb
+++ b/spec/lib/banzai/filter/emoji_filter_spec.rb
@@ -3,15 +3,6 @@ require 'spec_helper'
 describe Banzai::Filter::EmojiFilter do
   include FilterSpecHelper
 
-  before do
-    @original_asset_host = ActionController::Base.asset_host
-    ActionController::Base.asset_host = 'https://foo.com'
-  end
-
-  after do
-    ActionController::Base.asset_host = @original_asset_host
-  end
-
   it 'replaces supported name emoji' do
     doc = filter('<p>:heart:</p>')
     expect(doc.css('gl-emoji').first.text).to eq '❤'