diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-11-04 15:22:36 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-11-04 15:22:36 +0000 |
| commit | d12e764744e3be11c7ed886fb454e09a4d1f57d6 (patch) | |
| tree | 66b12fe2442f6ac35597b066b5e32489fc1ff3e9 /app/controllers | |
| parent | 5368b9f249485e254a90fe7daa551d61412bee26 (diff) | |
| parent | 065ba130585cbce5a2835def94a650d26493abb0 (diff) | |
| download | gitlab-ce-d12e764744e3be11c7ed886fb454e09a4d1f57d6.tar.gz | |
Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master'
Add setting to only allow merge requests to be merged when all discussions are resolved
_Originally opened at !6385 by @rodolfoasantos._
- - -
## What does this MR do?
Based on #20968 this merge request adds setting only to allow merge requests to be merged when all discussions are resolved.
## Are there points in the code the reviewer needs to double check?
Check if there are other points to add the resolved discussion setting
## Why was this MR needed?
Add the possibility to configure the project to only accept merge request when all discussions are resolved
## Screenshots
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #20968
See merge request !7125
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index bce5e29d8d8..6988527a3be 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -335,6 +335,7 @@ class ProjectsController < Projects::ApplicationController :visibility_level, :import_url, :last_activity_at, :namespace_id, :avatar, :build_allow_git_fetch, :build_timeout_in_minutes, :build_coverage_regex, :public_builds, :only_allow_merge_if_build_succeeds, :request_access_enabled, + :only_allow_merge_if_all_discussions_are_resolved, :lfs_enabled, project_feature_attributes ) end |