gitlab-org--gitlab-foss/app/assets/javascripts/merge_conflicts
2018-03-09 15:18:09 -06:00
..
components Replace $.get in diff file editor with axios 2018-02-02 14:22:13 -06:00
mixins Remove .es6 from file extensions (!9241) 2017-03-05 21:22:40 +01:00
merge_conflict_service.js Convert merge_conflict_service.js to axios 2018-01-30 16:47:19 +00:00
merge_conflict_store.js require jQuery to be explicitly imported 2018-03-09 15:18:09 -06:00
merge_conflicts_bundle.js require jQuery to be explicitly imported 2018-03-09 15:18:09 -06:00