diff options
author | Robert Speicher <robert@gitlab.com> | 2015-12-15 20:52:04 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2015-12-15 20:52:04 +0000 |
commit | 5ffed49fef07a06f46f7e4e3511d7f6b9f378892 (patch) | |
tree | 597b5cc1fb40ffb12e0b1ec8e16eee0964da6fa9 /lib/gitlab/asciidoc.rb | |
parent | 28a8d0b5db104be6d01ad647aefcd92ec9ec113e (diff) | |
parent | 6560d053ed0c2d5b0a00918e64417bd6b1de4d73 (diff) | |
download | gitlab-ce-5ffed49fef07a06f46f7e4e3511d7f6b9f378892.tar.gz |
Merge branch 'lazy-reference-extractor' into 'master'
Move Markdown/reference logic from `Gitlab::Markdown` to `Banzai`
- Moves from `Gitlab::Markdown` to `Banzai`
- Moves filters and pipelines into their own namespace: `Banzai::Filter` and `Banzai::Pipeline`
- No more `autoload`!
- Split up `Gitlab::ReferenceExtractor` into `Banzai::ReferenceExtractor` and `Gitlab::ReferenceExtractor`
- Replace `something(load_lazy_references: true)` by `Gitlab::ReferenceExtractor.lazily { something }`
Goes from:
```ruby
def referenced_merge_requests
references = [self, *notes].flat_map do |note|
note.all_references(load_lazy_references: false).merge_requests
end.uniq!
Gitlab::Markdown::ReferenceFilter::LazyReference.load(references).uniq.sort_by(&:iid)
end
```
to
```ruby
def referenced_merge_requests
Gitlab::ReferenceExtractor.lazily do
[self, *notes].flat_map do |note|
note.all_references.merge_requests
end
end.sort_by(&:iid)
end
```
See merge request !2027
Diffstat (limited to 'lib/gitlab/asciidoc.rb')
-rw-r--r-- | lib/gitlab/asciidoc.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/asciidoc.rb b/lib/gitlab/asciidoc.rb index 330d3342dd1..b203b9d70e4 100644 --- a/lib/gitlab/asciidoc.rb +++ b/lib/gitlab/asciidoc.rb @@ -32,7 +32,7 @@ module Gitlab html = ::Asciidoctor.convert(input, asciidoc_opts) if context[:project] - html = Gitlab::Markdown.render(html, context.merge(pipeline: :asciidoc)) + html = Banzai.render(html, context.merge(pipeline: :asciidoc)) end html.html_safe |