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
| Status | Job ID | Name | Coverage | ||||||
|---|---|---|---|---|---|---|---|---|---|
| Prepare | |||||||||
| passed |
#5878733
|
knapsack |
00:01:09
|
|
|||||
| Test | |||||||||
| passed |
#5879108
|
bundler:audit |
00:07:55
|
|
|||||
| passed |
#5879107
|
bundler:check |
00:07:46
|
|
|||||
| passed |
#5879090
|
license_finder |
00:04:10
|
|
|||||
| passed |
#5879105
|
lint-doc |
00:01:09
|
|
|||||
| passed |
#5879116
|
lint-javascript |
00:06:22
|
|
|||||
| passed |
#5879112
|
migration paths |
00:12:42
|
|
|||||
| passed |
#5879088
|
rake brakeman |
00:02:29
|
|
|||||
| passed |
#5879096
|
rake db:migrate:reset |
00:02:09
|
|
|||||
| passed |
#5879098
|
rake db:seed_fu |
00:05:14
|
|
|||||
| passed |
#5879093
|
rake downtime_check |
00:04:04
|
|
|||||
| passed |
#5879089
|
rake flay |
00:04:09
|
|
|||||
| passed |
#5879080
|
rake haml_lint |
00:04:28
|
|
|||||
| passed |
#5879081
|
rake scss_lint |
00:01:37
|
|
|||||
| passed |
#5878734
|
rspec 0 20 |
00:11:50
|
|
|||||
| passed |
#5879017
|
rspec 0 20 ruby21 |
00:14:34
|
|
|||||
| passed |
#5878735
|
rspec 1 20 |
00:26:05
|
|
|||||
| passed |
#5879019
|
rspec 1 20 ruby21 |
00:28:32
|
|
|||||
| passed |
#5878774
|
rspec 10 20 |
00:31:44
|
|
|||||
| passed |
#5879035
|
rspec 10 20 ruby21 |
00:26:30
|
|
|||||
| passed |
#5878777
|
rspec 11 20 |
00:42:02
|
|
|||||
| passed |
#5879036
|
rspec 11 20 ruby21 |
00:40:01
|
|
|||||
| passed |
#5878779
|
rspec 12 20 |
00:25:39
|
|
|||||
| passed |
#5879037
|
rspec 12 20 ruby21 |
00:31:20
|
|
|||||
| passed |
#5878837
|
rspec 13 20 |
00:27:49
|
|
|||||
| passed |
#5879038
|
rspec 13 20 ruby21 |
00:30:45
|
|
|||||
| passed |
#5878857
|
rspec 14 20 |
00:40:01
|
|
|||||
| passed |
#5879039
|
rspec 14 20 ruby21 |
00:40:25
|
|
|||||
| passed |
#5878858
|
rspec 15 20 |
00:21:00
|
|
|||||
| passed |
#5879042
|
rspec 15 20 ruby21 |
00:24:00
|
|
|||||
| passed |
#5878868
|
rspec 16 20 |
00:24:40
|
|
|||||
| passed |
#5879047
|
rspec 16 20 ruby21 |
00:32:18
|
|
|||||
| passed |
#5878908
|
rspec 17 20 |
00:16:50
|
|
|||||
| passed |
#5879048
|
rspec 17 20 ruby21 |
00:18:13
|
|
|||||
| passed |
#5878940
|
rspec 18 20 |
00:16:32
|
|
|||||
| passed |
#5879050
|
rspec 18 20 ruby21 |
00:20:44
|
|
|||||
| passed |
#5878942
|
rspec 19 20 |
00:12:30
|
|
|||||
| passed |
#5879051
|
rspec 19 20 ruby21 |
00:14:43
|
|
|||||
| passed |
#5878747
|
rspec 2 20 |
00:32:33
|
|
|||||
| passed |
#5879023
|
rspec 2 20 ruby21 |
00:26:24
|
|
|||||
| passed |
#5878749
|
rspec 3 20 |
00:36:59
|
|
|||||
| passed |
#5879027
|
rspec 3 20 ruby21 |
00:28:18
|
|
|||||
| passed |
#5878751
|
rspec 4 20 |
00:16:21
|
|
|||||
| passed |
#5879029
|
rspec 4 20 ruby21 |
00:16:33
|
|
|||||
| passed |
#5878757
|
rspec 5 20 |
00:45:07
|
|
|||||
| passed |
#5879030
|
rspec 5 20 ruby21 |
00:38:36
|
|
|||||
| passed |
#5878760
|
rspec 6 20 |
00:27:56
|
|
|||||
| passed |
#5879031
|
rspec 6 20 ruby21 |
00:24:00
|
|
|||||
| passed |
#5878771
|
rspec 7 20 |
00:41:09
|
|
|||||
| passed |
#5879032
|
rspec 7 20 ruby21 |
00:44:41
|
|
|||||
| passed |
#5878772
|
rspec 8 20 |
00:27:02
|
|
|||||
| passed |
#5879033
|
rspec 8 20 ruby21 |
00:27:15
|
|
|||||
| passed |
#5878773
|
rspec 9 20 |
00:17:14
|
|
|||||
| passed |
#5879034
|
rspec 9 20 ruby21 |
00:21:25
|
|
|||||
| passed |
#5879079
|
rubocop |
00:08:56
|
|
|||||
| passed |
#5878950
|
spinach 0 10 |
00:12:10
|
|
|||||
| passed |
#5879054
|
spinach 0 10 ruby21 |
00:12:20
|
|
|||||
| passed |
#5878958
|
spinach 1 10 |
00:32:39
|
|
|||||
| passed |
#5879055
|
spinach 1 10 ruby21 |
00:34:29
|
|
|||||
| passed |
#5878966
|
spinach 2 10 |
00:24:21
|
|
|||||
| passed |
#5879057
|
spinach 2 10 ruby21 |
00:28:50
|
|
|||||
| passed |
#5878971
|
spinach 3 10 |
00:10:13
|
|
|||||
| passed |
#5879062
|
spinach 3 10 ruby21 |
00:15:28
|
|
|||||
| passed |
#5878975
|
spinach 4 10 |
00:26:22
|
|
|||||
| passed |
#5879067
|
spinach 4 10 ruby21 |
00:32:36
|
|
|||||
| passed |
#5878977
|
spinach 5 10 |
00:28:58
|
|
|||||
| passed |
#5879068
|
spinach 5 10 ruby21 |
00:25:32
|
|
|||||
| passed |
#5878978
|
spinach 6 10 |
00:21:38
|
|
|||||
| passed |
#5879070
|
spinach 6 10 ruby21 |
00:23:29
|
|
|||||
| passed |
#5878980
|
spinach 7 10 |
00:19:55
|
|
|||||
| passed |
#5879071
|
spinach 7 10 ruby21 |
00:28:24
|
|
|||||
| passed |
#5878999
|
spinach 8 10 |
00:46:11
|
|
|||||
| passed |
#5879073
|
spinach 8 10 ruby21 |
00:45:39
|
|
|||||
| passed |
#5879015
|
spinach 9 10 |
00:50:21
|
|
|||||
| passed |
#5879074
|
spinach 9 10 ruby21 |
00:59:41
|
|
|||||
| passed |
#5879099
|
teaspoon |
00:15:49
|
|
|||||
| Post Test | |||||||||
| passed |
#5879118
|
coverage |
00:04:01
|
89.52% |
|
||||
| skipped |
#5879121
|
notify:slack |
|
||||||
| passed |
#5879119
|
trigger_docs |
00:01:23
|
|
|||||
| passed |
#5879117
|
update-knapsack |
00:03:54
|
|
|||||
| Pages | |||||||||
| passed |
#5879133
|
pages |
00:00:55
|
||||||
| Deploy | |||||||||
| failed |
#5882589
external
|
pages:deploy |
00:00:00
|
||||||