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
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
2017-01-19resolve all no-dupe-keys eslint violationsMike Greiling
2017-01-19resolve all x-spacing and no-spaced-x eslint violationsMike Greiling
2017-01-19resolve all padded-blocks eslint violationsMike Greiling
2017-01-19resolve all semi and no-extra-semi eslint violationsMike Greiling
2017-01-19resolve all no-plusplus eslint violationsMike Greiling
2017-01-10migrate all javascript asset bundles and require syntaxMike Greiling
2016-12-14expand remaining non-explicit eslint-disable blocks and factor out globals wh...Mike Greiling
2016-11-10Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran
2016-11-10Remove unnecesarry require.Fatih Acet
2016-11-10VueJSMigration: Remove parallel-conflict-line component.Fatih Acet
2016-11-10Vue migration fix syntax highlighting.Fatih Acet
2016-11-10Migrate Vue v1 to v2.Fatih Acet
2016-10-26disable ESLint for all JavaScript fileswinniehell
2016-10-25remove manual Cookie.set "path" option in favor of global settingMike Greiling
2016-10-25replace jquery.cookie vendor script with js.cookieMike Greiling
2016-10-17Provide better error message to the userAlfredo Sumaran
2016-10-13Add syntax highlighting to filesAlfredo Sumaran
2016-10-13Use plain JS to get elements and data and valuesAlfredo Sumaran
2016-10-13Add more tests to check conflicts resolutionAlfredo Sumaran
2016-10-13Improve components for PhantomJs compatibilityAlfredo Sumaran
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 17:13:31 +0300