gitlab-org--gitlab-foss/app/assets/javascripts/merge_conflicts
Phil Hughes fa2af5e0f5
Flash is now a ES6 module
Reduced the technical debt around our JS flash function by making it a
module that is imported rather than relying on the global function.
The global function still exists mainly for technical debt with how
some requests are being completed, but new JS should import the module
directly.

Also reduces some tech debt in the file by removing the need for jQuery.
Instead Flash is now 100% vanilla JS.
2017-10-10 10:14:22 +01:00
..
components Flash is now a ES6 module 2017-10-10 10:14:22 +01:00
mixins Remove .es6 from file extensions (!9241) 2017-03-05 21:22:40 +01:00
merge_conflict_service.js Remove .es6 from file extensions (!9241) 2017-03-05 21:22:40 +01:00
merge_conflict_store.js fix conflict pluralized 2017-07-24 17:11:12 +02:00
merge_conflicts_bundle.js Flash is now a ES6 module 2017-10-10 10:14:22 +01:00