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
..
ci	Fix duration specs	2016-10-26 11:47:30 +02:00
concerns	Fix project features default values	2016-11-01 11:03:56 -02:00
cycle_analytics	fixed newline	2016-10-12 14:30:49 +02:00
hooks	Remove schema annotations completely	2016-09-16 14:37:48 +03:00
issue	Add a be_like_time matcher and use it in specs	2016-10-17 14:44:20 +01:00
members	Optimize Event queries by removing default order	2016-10-27 20:07:11 -03:00
merge_request	Add a be_like_time matcher and use it in specs	2016-10-17 14:44:20 +01:00
network
project_services	Use stubs instead of modifying global states	2016-11-03 23:02:19 +08:00
ability_spec.rb	Project tools visibility level	2016-09-01 11:47:59 -03:00
abuse_report_spec.rb	Add markdown cache columns to the database, but don't use them yet	2016-10-07 02:54:25 +01:00
appearance_spec.rb	Use build instead create record in appearance_spec	2016-10-12 10:50:01 +05:00
application_setting_spec.rb	Allow multiple repository storage shards to be enabled, and automatically round-robin between them	2016-11-04 04:01:08 +00:00
award_emoji_spec.rb
blob_spec.rb	Handle encoding in non-binary Blob instances	2016-09-14 14:15:31 +02:00
board_spec.rb
broadcast_message_spec.rb
build_spec.rb	Rename ignored to failed_but_allowed, introduce exclude_ignored	2016-10-03 18:22:51 +08:00
commit_range_spec.rb	Use JavaScript tooltips for mentions (!5301)	2016-09-01 01:21:34 +02:00
commit_spec.rb	refactors tests because of gitlab-test repository changes	2016-10-11 16:33:06 +01:00
commit_status_spec.rb	Add test for CommitStatus.exclude_ignored	2016-10-03 18:56:32 +08:00
compare_spec.rb
deploy_key_spec.rb	Remove unused lets from deploy_key spec	2016-10-12 10:46:30 +05:00
deploy_keys_project_spec.rb
deployment_spec.rb	Work on specs	2016-10-17 17:10:26 +02:00
diff_note_spec.rb	Optimize discussion notes resolving and unresolving	2016-09-06 12:14:09 -03:00
discussion_spec.rb	Optimize discussion notes resolving and unresolving	2016-09-06 12:14:09 -03:00
email_spec.rb	refactor(email): use setter method instead AR callbacks	2016-10-23 17:30:07 +05:00
environment_spec.rb	Fix remaining offenses	2016-10-18 13:51:12 +02:00
event_spec.rb	Differentiate the expire from leave event	2016-10-20 00:26:45 +00:00
external_issue_spec.rb	Prevent wrong markdown on issue ids when project has Jira service activated	2016-10-19 13:46:04 -02:00
forked_project_link_spec.rb	Enforce the fork_project permission in Projects::CreateService	2016-09-27 13:17:56 +01:00
generic_commit_status_spec.rb
global_milestone_spec.rb	Ensure milestones passed to GlobalMilestone is an ActiveRecord::Relation	2016-09-23 13:34:39 +02:00
group_label_spec.rb	Add subject to group and projects labels which return group/project	2016-10-19 14:58:27 -02:00
group_spec.rb	Revert "Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".""	2016-10-27 16:16:15 +03:00
identity_spec.rb
issue_spec.rb	Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method	2016-10-20 12:55:14 +02:00
key_spec.rb	Remove empty describe block on key spec model	2016-10-11 11:02:53 +05:00
label_link_spec.rb	Build instead create in label_link model spec	2016-10-11 10:58:46 +05:00
label_priority_spec.rb	Add support to group labels prioritization on project level	2016-10-19 14:58:27 -02:00
label_spec.rb	Abstract LabelPriority away into methods on Label model	2016-10-19 14:58:27 -02:00
legacy_diff_note_spec.rb
list_spec.rb
member_spec.rb	Members::RequestAccessService is tricter on permissions	2016-10-03 10:06:40 +02:00
merge_request_diff_spec.rb	Better tests for MergeRequestDiff#compare_with method	2016-10-12 16:32:57 +03:00
merge_request_spec.rb	Complete and improve specs	2016-11-04 14:58:40 +01:00
milestone_spec.rb	Allowing ">" to be used for Milestone models's title and storing the value in db as unescaped.	2016-09-29 19:28:38 -07:00
namespace_spec.rb	Correct namespace validation to forbid bad names #21077	2016-10-07 13:46:59 -05:00
note_spec.rb	remove Ability.abilities	2016-08-30 11:35:06 -07:00
notification_setting_spec.rb
personal_access_token_spec.rb
project_feature_spec.rb	Add visibility level to project repository	2016-10-17 18:12:18 -02:00
project_group_link_spec.rb	Merge branch 'api-fix-project-group-sharing' into 'security'	2016-10-11 20:36:26 +02:00
project_label_spec.rb	Add subject to group and projects labels which return group/project	2016-10-19 14:58:27 -02:00
project_snippet_spec.rb
project_spec.rb	Allow multiple repository storage shards to be enabled, and automatically round-robin between them	2016-11-04 04:01:08 +00:00
project_team_spec.rb	Fix specs that requires an access request	2016-09-22 11:12:17 +02:00
project_wiki_spec.rb
protected_branch_spec.rb
release_spec.rb
repository_spec.rb	Merge branch '22271-drone-tag-pipeline-build' into 'master'	2016-10-31 14:09:39 +00:00
service_spec.rb	Add markdown cache columns to the database, but don't use them yet	2016-10-07 02:54:25 +01:00
snippet_spec.rb	Add markdown cache columns to the database, but don't use them yet	2016-10-07 02:54:25 +01:00
spam_log_spec.rb
todo_spec.rb
tree_spec.rb
trending_project_spec.rb	Precalculate trending projects	2016-10-10 12:27:08 +02:00
user_agent_detail_spec.rb
user_spec.rb	Fix: Todos Filter Shows All Users	2016-11-04 13:41:14 +02:00
wiki_page_spec.rb