diff options
| author | Ashley Dumaine <adumaine@datto.com> | 2017-09-01 18:39:22 -0400 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-09-06 10:07:47 +0100 |
| commit | a3f76b76a4b8db85c6fa557a5e801dcea7195735 (patch) | |
| tree | 730f99b9e673ed511a41113cd713ed39702c839f /lib/api/projects.rb | |
| parent | 959e6d221d6b11c64d17fc9d4734200806c293ab (diff) | |
| download | gitlab-ce-a3f76b76a4b8db85c6fa557a5e801dcea7195735.tar.gz | |
change collapse to resolve and comments to discussions
Diffstat (limited to 'lib/api/projects.rb')
| -rw-r--r-- | lib/api/projects.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 558eace80f3..7dc19788462 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -16,7 +16,7 @@ module API optional :jobs_enabled, type: Boolean, desc: 'Flag indication if jobs are enabled' optional :snippets_enabled, type: Boolean, desc: 'Flag indication if snippets are enabled' optional :shared_runners_enabled, type: Boolean, desc: 'Flag indication if shared runners are enabled for that project' - optional :collapse_outdated_diff_comments, type: Boolean, desc: 'Collapse outdated diffs regardless of discussion resolution' + optional :resolve_outdated_diff_discussions, type: Boolean, desc: 'Automatically resolve merge request diffs discussions on lines changed with a push' optional :container_registry_enabled, type: Boolean, desc: 'Flag indication if the container registry is enabled for that project' optional :lfs_enabled, type: Boolean, desc: 'Flag indication if Git LFS is enabled for that project' optional :visibility, type: String, values: Gitlab::VisibilityLevel.string_values, desc: 'The visibility of the project.' @@ -237,7 +237,7 @@ module API at_least_one_of_ce = [ :jobs_enabled, - :collapse_outdated_diff_comments, + :resolve_outdated_diff_discussions, :container_registry_enabled, :default_branch, :description, |