diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-03-30 21:06:09 -0600 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
commit | 21e10888c3fc0fe545c0443cf0e23f593df847a4 (patch) | |
tree | c6c89c2ea2c75ffae4529ab4dceb937ce2f6299a /app/models/concerns | |
parent | fe26b8af94e8e12a66249e28e34196a4f8b987c4 (diff) | |
download | gitlab-ce-21e10888c3fc0fe545c0443cf0e23f593df847a4.tar.gz |
Address review comments
Diffstat (limited to 'app/models/concerns')
-rw-r--r-- | app/models/concerns/resolvable_discussion.rb | 14 | ||||
-rw-r--r-- | app/models/concerns/resolvable_note.rb | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/app/models/concerns/resolvable_discussion.rb b/app/models/concerns/resolvable_discussion.rb index 3141c150ac9..22cd9bb7fd4 100644 --- a/app/models/concerns/resolvable_discussion.rb +++ b/app/models/concerns/resolvable_discussion.rb @@ -2,12 +2,14 @@ module ResolvableDiscussion extend ActiveSupport::Concern included do - memoized_values << :resolvable - memoized_values << :resolved - memoized_values << :first_note - memoized_values << :first_note_to_resolve - memoized_values << :last_resolved_note - memoized_values << :last_note + memoized_values.push( + :resolvable, + :resolved, + :first_note, + :first_note_to_resolve, + :last_resolved_note, + :last_note + ) delegate :resolved_at, :resolved_by, diff --git a/app/models/concerns/resolvable_note.rb b/app/models/concerns/resolvable_note.rb index 2aba979938b..1155ec22369 100644 --- a/app/models/concerns/resolvable_note.rb +++ b/app/models/concerns/resolvable_note.rb @@ -8,7 +8,9 @@ module ResolvableNote validates :resolved_by, presence: true, if: :resolved? - # Keep this scope in sync with the logic in `#potentially_resolvable?` in `Discussion` subclasses that are resolvable + # Keep this scope in sync with the logic in `#potentially_resolvable?` in `Discussion` subclasses that are resolvable. + # `RESOLVABLE_TYPES` should include names of all subclasses that are resolvable (where the method can return true), and + # the scope should also match the criteria `ResolvableDiscussion#potentially_resolvable?` puts on resolvability. scope :potentially_resolvable, -> { where(type: RESOLVABLE_TYPES).where(noteable_type: 'MergeRequest') } # Keep this scope in sync with `#resolvable?` scope :resolvable, -> { potentially_resolvable.user } |