Add MR mergeability check for locked paths
This change introduces a new check. This check will prevent merging MRs which include locked paths. We also have a check which runs when a user pushes code that prevents pushing paths that are locked by other users. This change will allow us to enable the fix for https://gitlab.com/gitlab-org/gitlab/-/issues/23625 Related to https://gitlab.com/gitlab-org/gitlab/-/issues/428247 Changelog: added # Conflicts: # app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js # app/graphql/types/merge_requests/detailed_merge_status_enum.rb # app/models/merge_request.rb # doc/api/graphql/reference/index.md # doc/api/merge_requests.md # ee/app/models/ee/merge_request.rb
显示
- app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js 1 个添加, 0 个删除...s/vue_merge_request_widget/components/checks/constants.js
- app/graphql/types/merge_requests/detailed_merge_status_enum.rb 3 个添加, 0 个删除...raphql/types/merge_requests/detailed_merge_status_enum.rb
- app/models/merge_request.rb 2 个添加, 0 个删除app/models/merge_request.rb
- doc/api/graphql/reference/index.md 2 个添加, 0 个删除doc/api/graphql/reference/index.md
- doc/api/merge_requests.md 1 个添加, 0 个删除doc/api/merge_requests.md
- ee/app/models/ee/merge_request.rb 2 个添加, 1 个删除ee/app/models/ee/merge_request.rb
- ee/app/models/path_lock.rb 1 个添加, 0 个删除ee/app/models/path_lock.rb
- ee/app/services/merge_requests/mergeability/check_path_locks_service.rb 59 个添加, 0 个删除...s/merge_requests/mergeability/check_path_locks_service.rb
- ee/config/feature_flags/beta/locked_paths_mergeability_check.yml 9 个添加, 0 个删除...ig/feature_flags/beta/locked_paths_mergeability_check.yml
- ee/spec/graphql/ee/types/merge_request_type_spec.rb 4 个添加, 2 个删除ee/spec/graphql/ee/types/merge_request_type_spec.rb
- ee/spec/models/merge_request_spec.rb 4 个添加, 4 个删除ee/spec/models/merge_request_spec.rb
- ee/spec/services/merge_requests/mergeability/check_path_locks_service_spec.rb 142 个添加, 0 个删除...ge_requests/mergeability/check_path_locks_service_spec.rb
- locale/gitlab.pot 3 个添加, 0 个删除locale/gitlab.pot
加载中
想要评论请 注册 或 登录