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   ## 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
..
admin	Allow multiple repository storage shards to be enabled, and automatically round-robin between them	2016-11-04 04:01:08 +00:00
ci	Remove Ci::ApplicationController	2016-10-10 16:47:27 +02:00
concerns	Refactor JIRA service to use gem	2016-10-26 15:02:16 -02:00
dashboard	Limit what label fields we expose on Dashboard::LabelsController#index	2016-10-19 14:58:26 -02:00
explore	Precalculate trending projects	2016-10-10 12:27:08 +02:00
groups	Add parentheses around return redirect_to method	2016-10-24 13:14:00 +03:00
import	Merge branch 'security-fix-leaking-namespace-name' into 'security'	2016-10-24 15:49:05 +02:00
oauth	…
profiles	…
projects	Only skip group when it's actually a group in the "Share with group" select	2016-11-04 12:42:19 +01:00
sherlock	…
abuse_reports_controller.rb	…
application_controller.rb	Merge branch 'master' into merge-conflicts-editor-2	2016-10-17 10:56:55 +01:00
autocomplete_controller.rb	Fix: Todos Filter Shows All Users	2016-11-04 13:41:14 +02:00
confirmations_controller.rb	…
dashboard_controller.rb	…
emojis_controller.rb	…
groups_controller.rb	Syntax fixes and better tests for helper methods. Updated docs.	2016-09-15 14:10:49 -05:00
health_check_controller.rb	…
help_controller.rb	…
invites_controller.rb	…
jwt_controller.rb	Be nice to Docker Clients talking to JWT/auth	2016-09-27 16:59:05 +02:00
koding_controller.rb	…
notification_settings_controller.rb	…
omniauth_callbacks_controller.rb	…
passwords_controller.rb	…
profiles_controller.rb	Add organization field to user profile	2016-09-27 14:04:39 +03:00
projects_controller.rb	Complete and improve specs	2016-11-04 14:58:40 +01:00
registrations_controller.rb	…
root_controller.rb	…
search_controller.rb	…
sent_notifications_controller.rb	Fix initial implementation to actually render the unsubscribe page	2016-09-20 09:52:57 +02:00
sessions_controller.rb	…
snippets_controller.rb	Added 'Download' button to snippet view	2016-10-11 15:36:59 -04:00
uploads_controller.rb	…
users_controller.rb	Add exists to users routes and fix endpoint.	2016-10-15 08:28:55 +02:00