-
- 下载
Merge branch 'refactor_merge_when_x_pass_4' into 'master'
Refactor the available_for methods for auto merge See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/146153 Merged-by:Sincheol (David) Kim <dkim@gitlab.com> Approved-by:
显示
- app/models/merge_request.rb 35 个添加, 20 个删除app/models/merge_request.rb
- app/services/auto_merge/base_service.rb 18 个添加, 5 个删除app/services/auto_merge/base_service.rb
- app/services/auto_merge/merge_when_pipeline_succeeds_service.rb 1 个添加, 5 个删除...rvices/auto_merge/merge_when_pipeline_succeeds_service.rb
- app/services/auto_merge_service.rb 2 个添加, 0 个删除app/services/auto_merge_service.rb
- config/feature_flags/gitlab_com_derisk/refactor_auto_merge.yml 9 个添加, 0 个删除...g/feature_flags/gitlab_com_derisk/refactor_auto_merge.yml
- ee/app/models/ee/merge_request.rb 0 个添加, 14 个删除ee/app/models/ee/merge_request.rb
- ee/app/services/auto_merge/merge_when_checks_pass_service.rb 14 个添加, 1 个删除ee/app/services/auto_merge/merge_when_checks_pass_service.rb
- ee/app/services/ee/auto_merge_service.rb 2 个添加, 3 个删除ee/app/services/ee/auto_merge_service.rb
- ee/spec/controllers/projects/merge_requests_controller_spec.rb 1 个添加, 1 个删除...ec/controllers/projects/merge_requests_controller_spec.rb
- ee/spec/features/merge_request/code_owner_approvals_reset_after_merging_to_source_branch_spec.rb 2 个添加, 1 个删除...er_approvals_reset_after_merging_to_source_branch_spec.rb
- ee/spec/features/merge_request/user_merges_with_push_rules_spec.rb 4 个添加, 1 个删除...eatures/merge_request/user_merges_with_push_rules_spec.rb
- ee/spec/features/merge_trains/two_merge_requests_on_train_spec.rb 2 个添加, 2 个删除...features/merge_trains/two_merge_requests_on_train_spec.rb
- ee/spec/requests/api/merge_trains_spec.rb 1 个添加, 1 个删除ee/spec/requests/api/merge_trains_spec.rb
- ee/spec/services/auto_merge/merge_when_checks_pass_service_spec.rb 272 个添加, 83 个删除...ervices/auto_merge/merge_when_checks_pass_service_spec.rb
- ee/spec/services/merge_trains/add_merge_request_service_spec.rb 1 个添加, 1 个删除...c/services/merge_trains/add_merge_request_service_spec.rb
- spec/features/merge_request/user_resolves_wip_mr_spec.rb 36 个添加, 4 个删除spec/features/merge_request/user_resolves_wip_mr_spec.rb
- spec/features/merge_request/user_sees_merge_widget_spec.rb 23 个添加, 4 个删除spec/features/merge_request/user_sees_merge_widget_spec.rb
- spec/models/merge_request_spec.rb 46 个添加, 1 个删除spec/models/merge_request_spec.rb
- spec/services/auto_merge/base_service_spec.rb 67 个添加, 12 个删除spec/services/auto_merge/base_service_spec.rb
- spec/services/merge_requests/merge_orchestration_service_spec.rb 1 个添加, 1 个删除...rvices/merge_requests/merge_orchestration_service_spec.rb
加载中
想要评论请 注册 或 登录