-
- 下载
Merge branch '413104-allow-merges-from-train-ref' into 'master'
Support Merging the merge train ref directly See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125921 Merged-by:A Browne <abrowne@gitlab.com> Approved-by:
A Browne <abrowne@gitlab.com> Reviewed-by:
Fabio Pitino <fpitino@gitlab.com> Reviewed-by:
Patrick Bajao <ebajao@gitlab.com> Reviewed-by:
Hordur Freyr Yngvason <hfyngvason@gitlab.com> Reviewed-by:
A Browne <abrowne@gitlab.com> Reviewed-by:
Max Fan <mfan@gitlab.com> Co-authored-by:
Hordur Freyr Yngvason <hfyngvason@gitlab.com> Co-authored-by:
Max Fan <mfan@gitlab.com>
显示
- app/models/merge_request.rb 6 个添加, 2 个删除app/models/merge_request.rb
- app/services/merge_requests/base_service.rb 1 个添加, 1 个删除app/services/merge_requests/base_service.rb
- app/services/merge_requests/merge_strategies/from_source_branch.rb 1 个添加, 1 个删除...ces/merge_requests/merge_strategies/from_source_branch.rb
- ee/app/models/merge_trains/train.rb 3 个添加, 1 个删除ee/app/models/merge_trains/train.rb
- ee/app/services/merge_requests/merge_strategies/from_train_ref.rb 89 个添加, 0 个删除...ervices/merge_requests/merge_strategies/from_train_ref.rb
- ee/app/services/merge_trains/refresh_merge_request_service.rb 7 个添加, 1 个删除...pp/services/merge_trains/refresh_merge_request_service.rb
- ee/spec/services/merge_requests/merge_strategies/from_train_ref_spec.rb 138 个添加, 0 个删除...es/merge_requests/merge_strategies/from_train_ref_spec.rb
- ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb 42 个添加, 0 个删除...rvices/merge_trains/refresh_merge_request_service_spec.rb
- spec/models/merge_request_spec.rb 51 个添加, 0 个删除spec/models/merge_request_spec.rb
- spec/services/merge_requests/base_service_spec.rb 28 个添加, 0 个删除spec/services/merge_requests/base_service_spec.rb
加载中
想要评论请 注册 或 登录