summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorAshley Dumaine <adumaine@datto.com>2017-09-01 18:39:22 -0400
committerSean McGivern <sean@gitlab.com>2017-09-06 10:07:47 +0100
commita3f76b76a4b8db85c6fa557a5e801dcea7195735 (patch)
tree730f99b9e673ed511a41113cd713ed39702c839f /lib/api/entities.rb
parent959e6d221d6b11c64d17fc9d4734200806c293ab (diff)
downloadgitlab-ce-a3f76b76a4b8db85c6fa557a5e801dcea7195735.tar.gz
change collapse to resolve and comments to discussions
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 2799fec9cb6..9114b69606b 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -119,7 +119,7 @@ module API
expose :archived?, as: :archived
expose :visibility
expose :owner, using: Entities::UserBasic, unless: ->(project, options) { project.group }
- expose :collapse_outdated_diff_comments
+ expose :resolve_outdated_diff_discussions
expose :container_registry_enabled
# Expose old field names with the new permissions methods to keep API compatible