-
- 下载
Merge branch 'nmezzopera-merge-conflict-store-connect' into 'master'
Swap custom store for vuex implementation in merge_conflicts See merge request gitlab-org/gitlab!56756
显示
- app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue 14 个添加, 18 个删除...vascripts/merge_conflicts/components/diff_file_editor.vue
- app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue 16 个添加, 9 个删除...ipts/merge_conflicts/components/inline_conflict_lines.vue
- app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue 13 个添加, 4 个删除...ts/merge_conflicts/components/parallel_conflict_lines.vue
- app/assets/javascripts/merge_conflicts/constants.js 1 个添加, 0 个删除app/assets/javascripts/merge_conflicts/constants.js
- app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue 75 个添加, 54 个删除...vascripts/merge_conflicts/merge_conflict_resolver_app.vue
- app/assets/javascripts/merge_conflicts/merge_conflict_service.js 0 个添加, 16 个删除...ets/javascripts/merge_conflicts/merge_conflict_service.js
- app/assets/javascripts/merge_conflicts/merge_conflict_store.js 0 个添加, 432 个删除...ssets/javascripts/merge_conflicts/merge_conflict_store.js
- app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js 12 个添加, 80 个删除...ets/javascripts/merge_conflicts/merge_conflicts_bundle.js
- app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js 0 个添加, 7 个删除...vascripts/merge_conflicts/mixins/line_conflict_actions.js
- app/assets/javascripts/merge_conflicts/store/actions.js 5 个添加, 0 个删除app/assets/javascripts/merge_conflicts/store/actions.js
- spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js 131 个添加, 0 个删除..._conflicts/components/merge_conflict_resolver_app_spec.js
- spec/frontend/merge_conflicts/mock_data.js 340 个添加, 0 个删除spec/frontend/merge_conflicts/mock_data.js
加载中
想要评论请 注册 或 登录