diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-06-04 14:06:21 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-06-04 14:06:21 +0000 |
| commit | 57f9856492775fef8e0bedc503e207b1d372f738 (patch) | |
| tree | 728a1a282c243a93b8faa3151c899e302b0334d6 /lib/api | |
| parent | 280aa61eec7efa0b60501546b6e1efedf0b9dc85 (diff) | |
| parent | 7412e2fa7478e1ec6a5a0014b7a4bdc6d07133b2 (diff) | |
| download | gitlab-ce-57f9856492775fef8e0bedc503e207b1d372f738.tar.gz | |
Merge branch 'bvl-design-diff-notes-ce' into 'master'
Adjustments related to DiffNotes on diffs outside of a project's main repository
See merge request gitlab-org/gitlab-ce!29023
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/discussions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/discussions.rb b/lib/api/discussions.rb index 5928ee1657b..693172b7d08 100644 --- a/lib/api/discussions.rb +++ b/lib/api/discussions.rb @@ -206,7 +206,7 @@ module API delete_note(noteable, params[:note_id]) end - if Noteable::RESOLVABLE_TYPES.include?(noteable_type.to_s) + if Noteable.resolvable_types.include?(noteable_type.to_s) desc "Resolve/unresolve an existing #{noteable_type.to_s.downcase} discussion" do success Entities::Discussion end |