diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /app/models/suggestion.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/models/suggestion.rb')
-rw-r--r-- | app/models/suggestion.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/suggestion.rb b/app/models/suggestion.rb index 8c72bd5ae7e..ff564d87449 100644 --- a/app/models/suggestion.rb +++ b/app/models/suggestion.rb @@ -1,10 +1,11 @@ # frozen_string_literal: true class Suggestion < ApplicationRecord + include Importable include Suggestible belongs_to :note, inverse_of: :suggestions - validates :note, presence: true + validates :note, presence: true, unless: :importing? validates :commit_id, presence: true, if: :applied? delegate :position, :noteable, to: :note |