diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2017-10-12 17:06:14 +0200 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-10-19 18:17:50 +0300 |
| commit | 66ab2ccbf10c4ddd46176cffcf7bb6c877c3f497 (patch) | |
| tree | 7e27eac47eb31f60a4050109b260654b5327d72d | |
| parent | 1e4b75ba40570a3e96e1999e375a120c4ba8b346 (diff) | |
| download | gitlab-ce-jk-reserve-epics-prefix.tar.gz | |
Make sure ‘&’ won’t be used for new ref types in CEjk-reserve-epics-prefix
| -rw-r--r-- | app/models/epic.rb | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/jk-reserve-epics-prefix.yml | 5 | ||||
| -rw-r--r-- | lib/banzai/reference_parser/epic_parser.rb | 12 | ||||
| -rw-r--r-- | lib/gitlab/reference_extractor.rb | 2 |
4 files changed, 28 insertions, 1 deletions
diff --git a/app/models/epic.rb b/app/models/epic.rb new file mode 100644 index 00000000000..91854970822 --- /dev/null +++ b/app/models/epic.rb @@ -0,0 +1,10 @@ +# Placeholder class for model that is implemented in EE +# It reserves '&' as a reference prefix, but the table does not exists in CE +class Epic < ActiveRecord::Base + def self.reference_prefix + '&' + end + + def self.reference_pattern + end +end diff --git a/changelogs/unreleased/jk-reserve-epics-prefix.yml b/changelogs/unreleased/jk-reserve-epics-prefix.yml new file mode 100644 index 00000000000..201d752c51d --- /dev/null +++ b/changelogs/unreleased/jk-reserve-epics-prefix.yml @@ -0,0 +1,5 @@ +--- +title: Make sure '&' won’t be used for new ref types in CE +merge_request: +author: +type: other diff --git a/lib/banzai/reference_parser/epic_parser.rb b/lib/banzai/reference_parser/epic_parser.rb new file mode 100644 index 00000000000..87ab22674f0 --- /dev/null +++ b/lib/banzai/reference_parser/epic_parser.rb @@ -0,0 +1,12 @@ +# for CE this is here only to make sure no other reference will use '&' as a prefix' +module Banzai + module ReferenceParser + class EpicParser < BaseParser + self.reference_type = :epic + + def references_relation + Epic + end + end + end +end diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb index bc836dcc08d..9ff82d628c0 100644 --- a/lib/gitlab/reference_extractor.rb +++ b/lib/gitlab/reference_extractor.rb @@ -1,7 +1,7 @@ module Gitlab # Extract possible GFM references from an arbitrary String for further processing. class ReferenceExtractor < Banzai::ReferenceExtractor - REFERABLES = %i(user issue label milestone merge_request snippet commit commit_range directly_addressed_user).freeze + REFERABLES = %i(user issue label milestone merge_request snippet commit commit_range directly_addressed_user epic).freeze attr_accessor :project, :current_user, :author def initialize(project, current_user = nil) |