diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-09 12:08:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-09 12:08:04 +0300 |
| commit | 2e2db606cc7547b445a11c367d8db6f5feb42443 (patch) | |
| tree | 58a4d9c8ea1e78aaea796a525ef79c037f3e0e51 /app/models | |
| parent | c789d0002c97a00e262be992adfcc0d26b72910e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/design_user_mention.rb | 4 | ||||
| -rw-r--r-- | app/models/work_items/type.rb | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/models/design_user_mention.rb b/app/models/design_user_mention.rb index baf4db29a0f..87899f65cb1 100644 --- a/app/models/design_user_mention.rb +++ b/app/models/design_user_mention.rb @@ -1,6 +1,10 @@ # frozen_string_literal: true class DesignUserMention < UserMention + include IgnorableColumns + + ignore_column :note_id_convert_to_bigint, remove_with: '16.0', remove_after: '2023-05-22' + belongs_to :design, class_name: 'DesignManagement::Design' belongs_to :note end diff --git a/app/models/work_items/type.rb b/app/models/work_items/type.rb index 9b434ef946c..258a86d7316 100644 --- a/app/models/work_items/type.rb +++ b/app/models/work_items/type.rb @@ -145,6 +145,10 @@ module WorkItems widgets.include? ::WorkItems::Widgets::Assignees end + def default_issue? + name == WorkItems::Type::TYPE_NAMES[:issue] + end + private def strip_whitespace |