-
- 下载
Merge branch '344883-aqualls-conflicts-modal' into 'master'
Revise merge-conflict modal text See merge request gitlab-org/gitlab!80666
显示
- app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue 23 个添加, 7 个删除...equest_widget/components/mr_widget_how_to_merge_modal.vue
- app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue 1 个添加, 1 个删除..._request_widget/components/states/mr_widget_conflicts.vue
- locale/gitlab.pot 8 个添加, 8 个删除locale/gitlab.pot
- spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js 1 个添加, 1 个删除...e_mr_widget/components/states/mr_widget_conflicts_spec.js
- spec/frontend/vue_mr_widget/mr_widget_how_to_merge_modal_spec.js 2 个添加, 2 个删除...ontend/vue_mr_widget/mr_widget_how_to_merge_modal_spec.js
加载中
想要评论请 注册 或 登录