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
AgeCommit message (Expand)Author
2022-12-20Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42GitLab Bot
2022-10-20Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42GitLab Bot
2022-08-18Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42GitLab Bot
2022-06-20Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42GitLab Bot
2022-04-20Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42GitLab Bot
2022-03-18Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42GitLab Bot
2022-02-18Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42GitLab Bot
2021-12-20Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42GitLab Bot
2021-10-20Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42GitLab Bot
2021-07-20Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42GitLab Bot
2021-05-19Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.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
2021-01-20Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42Robert Speicher
2020-12-17Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42GitLab Bot
2020-11-19Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42GitLab Bot
2020-08-20Add latest changes from gitlab-org/gitlab@13-3-stable-eeGitLab Bot
2020-02-03Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-09-18Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-05-02Internationalisation of merge_conflicts directoryBrandon Labuschagne
2019-03-26Add .code to all tables holding diffsDouwe Maan
2018-10-13Remove dependencies on LinguistZeger-Jan van de Weg
2018-10-10Prettify merge_conflicts monitoring and notebook modulesMike Greiling
2018-10-09Resolve "Harmonize prettier and eslint configs"Mike Greiling
2018-06-25Enable "prefer-destructuring" in JS filesgfyoung
2018-06-20remove all unused eslint-disable rulesLukas Eipert
2018-06-15Removes unused imports and prettifies codeFilipa Lacerda
2018-06-13Merge branch 'master' into gl-remove-window-scopeFilipa Lacerda
2018-06-13Removes merge conflicts vue code from globalnamespaceFilipa Lacerda
2018-06-11Updates eslint vue plugin versionFilipa Lacerda
2018-05-21Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray
2018-03-10require jQuery to be explicitly importedMike Greiling
2018-02-28refactor merge conflicts bundle to reduce side effectsMike Greiling
2018-02-08Merge branch 'axios-diff-file-editor' into 'master'Fatih Acet
2018-02-02Replace $.get in diff file editor with axiosClement Ho
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-27Merge branch 'master' into ph-inline-jsPhil Hughes
2017-07-26fixed label subscription & merge conflictsPhil Hughes
2017-07-24fix conflict pluralizedEmilien Mottet
2017-05-16update remaining uses of CJS syntax to ES module syntaxMike Greiling
2017-03-22remove Cookies class from global spaceMike Greiling
2017-03-21remove Vue from the global spaceMike Greiling
2017-03-05Remove .es6 from file extensions (!9241)winniehell
2017-01-28Merge branch 'master' into go-go-gadget-webpackMike Greiling
2017-01-19resolve all prefer-const eslint violationsMike Greiling
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 15:58:08 +0300