summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2018-06-29 11:21:13 +0200
committerDouwe Maan <douwe@selenight.nl>2018-06-29 11:21:13 +0200
commitee2a9e0af0c91e4cc0d1c24acf35ff1eba1cc8db (patch)
tree5e001a3fd794e04f01082e80409f8a32fbf1c3c7 /lib
parent50a213112ee422bea6673cf15a8c4829ac8700ee (diff)
downloadgitlab-ce-ee2a9e0af0c91e4cc0d1c24acf35ff1eba1cc8db.tar.gz
Remove unused asset host logic from GfmPipeline and EmojiFilter spec
Diffstat (limited to 'lib')
-rw-r--r--lib/banzai/pipeline/gfm_pipeline.rb6
1 files changed, 1 insertions, 5 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