gitlab-org--gitlab-foss/app/views
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
..
abuse_report_mailer
abuse_reports
admin Merge branch '24059-round-robin-repository-storage' into 'master' 2016-11-04 11:37:49 +00:00
award_emoji
ci/lints
dashboard Fix: Todos Filter Shows All Users 2016-11-04 13:41:14 +02:00
devise Change show-gl-field-errors to gl-show-field-errors 2016-11-02 11:35:21 +01:00
discussions
doorkeeper
email_rejection_mailer
emojis
errors
events
explore
groups Merge branch '22947-fix_issues_atom_feed_url' into 'master' 2016-11-04 11:01:27 +00:00
help Fix typo on /help/ui to Alerts section 2016-10-26 12:41:54 +02:00
import Merge branch 'security-fix-leaking-namespace-name' into 'security' 2016-10-24 15:49:05 +02:00
invites
issues
kaminari/gitlab Makes table pagination responsive 2016-11-01 16:24:54 +00:00
koding
layouts Add custom text to column 2016-11-03 12:29:41 -05:00
notify
profiles
projects Add setting to only allow merge requests to be merged when all discussions are resolved 2016-11-04 14:58:40 +01:00
repository_check_mailer
search
sent_notifications
shared Merge branch '22914-mini-graph-icons' into 'master' 2016-11-03 22:28:47 +00:00
sherlock
snippets
u2f
users Fix haml_lint 2016-11-01 12:30:51 -05:00