Commit Graph

12 Commits

Author SHA1 Message Date
GitLab Bot f14507e586 Add latest changes from gitlab-org/gitlab@master 2020-02-03 09:08:42 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
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
Mike Greiling 56914c1ac9
Prettify merge_conflicts monitoring and notebook modules 2018-10-10 02:30:25 -05:00
Mike Greiling d76190371c Resolve "Harmonize prettier and eslint configs" 2018-10-09 15:25:53 +00:00
gfyoung 23cdae8eee Enable "prefer-destructuring" in JS files
Partially addresses #47006.
2018-06-25 11:53:57 -07:00
Annabel Dunstone Gray 06a2e3854e
Make it explicit that merge conflict feature commits to source branch 2018-05-21 11:36:54 -07:00
Mike Greiling f248be7257
require jQuery to be explicitly imported 2018-03-09 15:18:09 -06:00
Emilien Mottet a8b33d7b5d fix conflict pluralized 2017-07-24 17:11:12 +02:00
Mike Greiling 5f7c0bd7b7 remove Cookies class from global space 2017-03-22 03:07:27 -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