-
- Downloads
Add setting to only allow merge requests to be merged when all discussions are resolved
Signed-off-by:
Rémy Coutable <remy@rymai.me>
Showing
- app/controllers/projects_controller.rb 3 additions, 2 deletionsapp/controllers/projects_controller.rb
- app/models/merge_request.rb 7 additions, 0 deletionsapp/models/merge_request.rb
- app/views/projects/_merge_request_settings.html.haml 4 additions, 0 deletionsapp/views/projects/_merge_request_settings.html.haml
- app/views/projects/merge_requests/widget/_open.html.haml 3 additions, 1 deletionapp/views/projects/merge_requests/widget/_open.html.haml
- app/views/projects/merge_requests/widget/open/_unresolved_discussions.html.haml 6 additions, 0 deletions...ge_requests/widget/open/_unresolved_discussions.html.haml
- changelogs/unreleased/20968-add-setting-to-check-unresolved-discussion.yml 4 additions, 0 deletions...ased/20968-add-setting-to-check-unresolved-discussion.yml
- db/migrate/20160914131004_only_allow_merge_if_all_discussions_are_resolved.rb 17 additions, 0 deletions...31004_only_allow_merge_if_all_discussions_are_resolved.rb
- db/schema.rb 1 addition, 0 deletionsdb/schema.rb
- doc/api/projects.md 10 additions, 0 deletionsdoc/api/projects.md
- lib/api/entities.rb 1 addition, 0 deletionslib/api/entities.rb
- lib/api/projects.rb 6 additions, 3 deletionslib/api/projects.rb
- spec/controllers/projects/merge_requests_controller_spec.rb 26 additions, 0 deletionsspec/controllers/projects/merge_requests_controller_spec.rb
- spec/factories/merge_requests.rb 5 additions, 0 deletionsspec/factories/merge_requests.rb
- spec/features/merge_requests/check_if_mergeable_with_unresolved_discussions.rb 53 additions, 0 deletions...equests/check_if_mergeable_with_unresolved_discussions.rb
- spec/models/merge_request_spec.rb 57 additions, 1 deletionspec/models/merge_request_spec.rb
- spec/requests/api/projects_spec.rb 35 additions, 1 deletionspec/requests/api/projects_spec.rb
Loading
Please register or sign in to comment