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-11-18Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2022-09-28Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2022-08-02Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2022-06-08Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2022-05-31Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2022-03-31Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2022-03-01Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2022-02-02Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-12-11Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-12-07Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-10-14Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-07-09Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-06-19Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-06-18Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-05-04Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-03-18Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-03-16Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-03-04Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-02-25Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-02-22Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-02-14Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-02-01Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-01-27Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-01-22Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-12-24Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-12-23Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-11-18Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-10-29Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-08-20Add latest changes from gitlab-org/gitlab@masterGitLab 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 08:00:36 +0300