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 /app/models/note.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 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 04053ccc61e..8c5b5836f9a 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -373,11 +373,11 @@ class Note < ActiveRecord::Base end def contains_emoji_only? - note =~ /\A#{Gitlab::Markdown::EmojiFilter.emoji_pattern}\s?\Z/ + note =~ /\A#{Banzai::Filter::EmojiFilter.emoji_pattern}\s?\Z/ end def award_emoji_name - original_name = note.match(Gitlab::Markdown::EmojiFilter.emoji_pattern)[1] + original_name = note.match(Banzai::Filter::EmojiFilter.emoji_pattern)[1] AwardEmoji.normilize_emoji_name(original_name) end end |
