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 /app/controllers | |
| parent | 959e6d221d6b11c64d17fc9d4734200806c293ab (diff) | |
| download | gitlab-ce-a3f76b76a4b8db85c6fa557a5e801dcea7195735.tar.gz | |
change collapse to resolve and comments to discussions
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 3cc61b5e682..b13034d3333 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -323,7 +323,7 @@ class ProjectsController < Projects::ApplicationController :build_allow_git_fetch, :build_coverage_regex, :build_timeout_in_minutes, - :collapse_outdated_diff_comments, + :resolve_outdated_diff_discussions, :container_registry_enabled, :default_branch, :description, |