gitlab-org--gitlab-foss/app
Douwe Maan d12e764744 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

![only_allow_merge_if_all_discussions_are_resolved](/uploads/9388db9421da0214590ffab6fb29f985/only_allow_merge_if_all_discussions_are_resolved.png)

![only_allow_merge_if_all_discussions_are_resolved_msg](/uploads/b1bba0c72ad67d3a1b34718baa08526e/only_allow_merge_if_all_discussions_are_resolved_msg.png)

## 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
2016-11-04 15:22:36 +00:00
..
assets Merge branch '22588-todos-filter-shows-all-users' into 'master' 2016-11-04 14:19:14 +00:00
controllers Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' 2016-11-04 15:22:36 +00:00
finders Skip authorization check when searching for labels on IssuableFinder 2016-10-31 23:27:49 -02:00
helpers Allow multiple repository storage shards to be enabled, and automatically round-robin between them 2016-11-04 04:01:08 +00:00
mailers Just show the first merge request we found, feedback: 2016-10-14 19:54:51 +08:00
models Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' 2016-11-04 15:22:36 +00:00
policies Allow owners to fetch source code in CI builds 2016-11-01 09:37:20 +01:00
services Merge branch '22448-fix-500-nonexisting-branch' into 'master' 2016-11-01 16:52:25 +00:00
uploaders
validators Add `robots.txt` to the list of reserved namespaces 2016-10-11 02:58:26 +01:00
views Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' 2016-11-04 15:22:36 +00:00
workers remove extra spaces from app/workers/post_receive.rb 2016-11-01 21:46:37 +00:00