gitlab-org--gitlab-foss/spec
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
..
bin DRY up the specs for bin/changelog 2016-11-03 17:35:06 +00:00
config Updated mail_room and added sentinel support to Reply by Email 2016-10-26 05:02:47 +02:00
controllers Complete and improve specs 2016-11-04 14:58:40 +01:00
factories Add setting to only allow merge requests to be merged when all discussions are resolved 2016-11-04 14:58:40 +01:00
features Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' 2016-11-04 15:22:36 +00:00
finders Fix lightweight tags not processed correctly by GitTagPushService 2016-10-28 13:53:18 -03:00
fixtures Merge branch 'master' into issue-board-sidebar 2016-10-26 08:47:09 +01:00
helpers
initializers
javascripts Move jquery.timeago to vendor directory 2016-11-03 16:13:35 -05:00
lib Merge branch 'fix/import-export-symlink-vulnerability' into 'security' 2016-11-03 16:04:18 +01:00
mailers
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
requests Add setting to only allow merge requests to be merged when all discussions are resolved 2016-11-04 14:58:40 +01:00
routing
services Merge branch 'allow-owner-to-run-ci-builds' into 'master' 2016-11-02 09:48:22 +00:00
support Merge branch 'fix/import-export-symlink-vulnerability' into 'security' 2016-11-03 16:04:18 +01:00
tasks/gitlab Add Rake task to create/repair GitLab Shell hooks symlinks 2016-11-01 14:52:59 -05:00
uploaders
views Merge branch '20892-commit-info' into 'master' 2016-10-31 21:29:29 +00:00
workers Remove unreferenced LFS objects from DB and fs 2016-10-28 19:39:20 +02:00
factories_spec.rb
rails_helper.rb
rake_helper.rb Add Rake task to create/repair GitLab Shell hooks symlinks 2016-11-01 14:52:59 -05:00
simplecov_env.rb
spec_helper.rb Replace static issue fixtures by script (!6059) 2016-10-28 14:02:17 +02:00
teaspoon_env.rb