summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
diff options
context:
space:
mode:
authorAshley Dumaine <adumaine@datto.com>2017-08-28 17:38:06 -0400
committerSean McGivern <sean@gitlab.com>2017-09-06 10:07:46 +0100
commitef4b3a39bc705dfa47762868ea064d2dbadc16e6 (patch)
tree62d4c53338eb976f1b854ecbe97e21b01bf894c9 /app/controllers/projects_controller.rb
parent446c7fc6f190ac8b8bb879a2a5be37c95fafdd13 (diff)
downloadgitlab-ce-ef4b3a39bc705dfa47762868ea064d2dbadc16e6.tar.gz
Add functionality to collapse outdated diff comments regardless of discussion resolution
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ed17b3b4689..3cc61b5e682 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -323,6 +323,7 @@ class ProjectsController < Projects::ApplicationController
:build_allow_git_fetch,
:build_coverage_regex,
:build_timeout_in_minutes,
+ :collapse_outdated_diff_comments,
:container_registry_enabled,
:default_branch,
:description,