Commit Graph

15 Commits

Author SHA1 Message Date
Brandon Labuschagne 7f75ac0ce8 Internationalisation of merge_conflicts directory
This is one of many MRs opened in order to improve the overall
internationalisation of the GitLab codebase.

i18n documentation
https://docs.gitlab.com/ee/development/i18n/externalization.html
2019-05-02 13:07:34 +00:00
gfyoung 23cdae8eee Enable "prefer-destructuring" in JS files
Partially addresses #47006.
2018-06-25 11:53:57 -07:00
Filipa Lacerda 4d61850c8d
Removes unused imports and prettifies code 2018-06-15 10:30:07 +01:00
Filipa Lacerda 75f692748d
Removes merge conflicts vue code from globalnamespace 2018-06-13 12:35:32 +01:00
Mike Greiling f248be7257
require jQuery to be explicitly imported 2018-03-09 15:18:09 -06:00
Mike Greiling c62fe6a293
refactor merge conflicts bundle to reduce side effects 2018-02-27 16:53:49 -06:00
Phil Hughes 965ff9653d
added missing calls in catch statements 2018-02-02 16:33:38 +00:00
Phil Hughes 8750507b5d
Convert merge_conflict_service.js to axios 2018-01-30 16:47:19 +00:00
Filipa Lacerda b299198e1e
Adds `eslint-plugin-vue`, fixes linter errors and adds docs 2018-01-03 23:14:55 +00:00
Filipa Lacerda aa90e8ea5b Export old code into es6 modules 2017-12-13 09:26:44 +00:00
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
Phil Hughes 425dbdd222 fixed label subscription & merge conflicts 2017-07-26 11:13:35 +01:00
Mike Greiling 5bd549187a update remaining uses of CJS syntax to ES module syntax 2017-05-16 15:52:40 -05:00
Mike Greiling d9dedc36c3 remove Vue from the global space 2017-03-20 22:12:01 -05:00
winniehell 572f9782d5 Remove .es6 from file extensions (!9241) 2017-03-05 21:22:40 +01:00