Support merge to ref for merge-commit and squash
Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
显示
- GITALY_SERVER_VERSION 1 个添加, 1 个删除GITALY_SERVER_VERSION
- Gemfile 2 个添加, 1 个删除Gemfile
- Gemfile.lock 2 个添加, 2 个删除Gemfile.lock
- app/models/merge_request.rb 14 个添加, 0 个删除app/models/merge_request.rb
- app/models/project.rb 8 个添加, 0 个删除app/models/project.rb
- app/models/repository.rb 6 个添加, 0 个删除app/models/repository.rb
- app/services/merge_requests/merge_base_service.rb 65 个添加, 0 个删除app/services/merge_requests/merge_base_service.rb
- app/services/merge_requests/merge_service.rb 18 个添加, 42 个删除app/services/merge_requests/merge_service.rb
- app/services/merge_requests/merge_to_ref_service.rb 76 个添加, 0 个删除app/services/merge_requests/merge_to_ref_service.rb
- changelogs/unreleased/osw-create-and-store-merge-ref-for-mrs.yml 5 个添加, 0 个删除...ogs/unreleased/osw-create-and-store-merge-ref-for-mrs.yml
- ee/app/services/ee/merge_requests/merge_base_service.rb 22 个添加, 22 个删除ee/app/services/ee/merge_requests/merge_base_service.rb
- ee/spec/services/merge_requests/merge_service_spec.rb 5 个添加, 77 个删除ee/spec/services/merge_requests/merge_service_spec.rb
- ee/spec/services/merge_requests/merge_to_ref_service_spec.rb 35 个添加, 0 个删除ee/spec/services/merge_requests/merge_to_ref_service_spec.rb
- ee/spec/support/shared_examples/services/merge_merge_requests.rb 98 个添加, 0 个删除.../support/shared_examples/services/merge_merge_requests.rb
- lib/gitlab/git/repository.rb 6 个添加, 0 个删除lib/gitlab/git/repository.rb
- lib/gitlab/gitaly_client/operation_service.rb 19 个添加, 0 个删除lib/gitlab/gitaly_client/operation_service.rb
- spec/lib/gitlab/git/repository_spec.rb 31 个添加, 0 个删除spec/lib/gitlab/git/repository_spec.rb
- spec/models/repository_spec.rb 23 个添加, 0 个删除spec/models/repository_spec.rb
- spec/services/merge_requests/merge_service_spec.rb 12 个添加, 0 个删除spec/services/merge_requests/merge_service_spec.rb
- spec/services/merge_requests/merge_to_ref_service_spec.rb 201 个添加, 0 个删除spec/services/merge_requests/merge_to_ref_service_spec.rb
加载中
想要评论请 注册 或 登录