diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 21:07:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 21:07:45 +0000 |
| commit | 0b12a5312c9701fbfed25fbb334d47900ced736b (patch) | |
| tree | a29a27e297134f573fd8e5c298d241f3156c207a /lib/banzai/pipeline | |
| parent | 92f95ccac81911d1fcc32e999a7f1ce04624a56c (diff) | |
| download | gitlab-ce-0b12a5312c9701fbfed25fbb334d47900ced736b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/banzai/pipeline')
| -rw-r--r-- | lib/banzai/pipeline/post_process_pipeline.rb | 5 | ||||
| -rw-r--r-- | lib/banzai/pipeline/relative_link_pipeline.rb | 13 |
2 files changed, 4 insertions, 14 deletions
diff --git a/lib/banzai/pipeline/post_process_pipeline.rb b/lib/banzai/pipeline/post_process_pipeline.rb index fe629a23ff1..5e02d972614 100644 --- a/lib/banzai/pipeline/post_process_pipeline.rb +++ b/lib/banzai/pipeline/post_process_pipeline.rb @@ -16,7 +16,10 @@ module Banzai [ Filter::ReferenceRedactorFilter, Filter::InlineMetricsRedactorFilter, - Filter::RelativeLinkFilter, + # UploadLinkFilter must come before RepositoryLinkFilter to + # prevent unnecessary Gitaly calls from being made. + Filter::UploadLinkFilter, + Filter::RepositoryLinkFilter, Filter::IssuableStateFilter, Filter::SuggestionFilter ] diff --git a/lib/banzai/pipeline/relative_link_pipeline.rb b/lib/banzai/pipeline/relative_link_pipeline.rb deleted file mode 100644 index 88651892acc..00000000000 --- a/lib/banzai/pipeline/relative_link_pipeline.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -module Banzai - module Pipeline - class RelativeLinkPipeline < BasePipeline - def self.filters - FilterArray[ - Filter::RelativeLinkFilter - ] - end - end - end -end |