summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/merge_conflict_store.js
Commit message (Expand)AuthorAgeFilesLines
* Internationalisation of merge_conflicts directoryBrandon Labuschagne2019-05-021-7/+8
* Prettify merge_conflicts monitoring and notebook modulesMike Greiling2018-10-101-27/+24
* Resolve "Harmonize prettier and eslint configs"Mike Greiling2018-10-091-1/+1
* Enable "prefer-destructuring" in JS filesgfyoung2018-06-251-2/+2
* Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray2018-05-211-1/+1
* require jQuery to be explicitly importedremove-jquery-globalsMike Greiling2018-03-091-0/+1
* fix conflict pluralizedEmilien Mottet2017-07-241-1/+1
* remove Cookies class from global spaceMike Greiling2017-03-221-1/+1
* remove Vue from the global spaceMike Greiling2017-03-201-1/+2
* Remove .es6 from file extensions (!9241)winniehell2017-03-051-0/+433