summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/merge_conflict_store.js
Commit message (Expand)AuthorAgeFilesLines
* 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