Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js
AgeCommit message (Expand)Author
2021-12-20Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42GitLab Bot
2021-04-21Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43GitLab Bot
2021-03-16Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40GitLab Bot
2021-02-18Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42GitLab Bot
2020-12-17Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42GitLab Bot
2020-08-20Add latest changes from gitlab-org/gitlab@13-3-stable-eeGitLab Bot
2019-05-02Internationalisation of merge_conflicts directoryBrandon Labuschagne
2018-06-25Enable "prefer-destructuring" in JS filesgfyoung
2018-06-15Removes unused imports and prettifies codeFilipa Lacerda
2018-06-13Removes merge conflicts vue code from globalnamespaceFilipa Lacerda
2018-03-10require jQuery to be explicitly importedMike Greiling
2018-02-28refactor merge conflicts bundle to reduce side effectsMike Greiling
2018-02-02added missing calls in catch statementsPhil Hughes
2018-01-30Convert merge_conflict_service.js to axiosPhil Hughes
2018-01-04Adds `eslint-plugin-vue`, fixes linter errors and adds docsFilipa Lacerda
2017-12-13Export old code into es6 modulesFilipa Lacerda
2017-10-10Flash is now a ES6 modulePhil Hughes
2017-07-26fixed label subscription & merge conflictsPhil Hughes
2017-05-16update remaining uses of CJS syntax to ES module syntaxMike Greiling
2017-03-21remove Vue from the global spaceMike Greiling
2017-03-05Remove .es6 from file extensions (!9241)winniehell
    generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 17:27:13 +0300