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/views/projects/merge_requests/conflicts
AgeCommit message (Expand)Author
2022-06-20Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42GitLab Bot
2021-10-20Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.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-11-19Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42GitLab Bot
2020-10-21Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42GitLab Bot
2020-09-19Add latest changes from gitlab-org/gitlab@13-4-stable-eeGitLab Bot
2020-07-20Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot
2020-02-13Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-06-06Format vue files with prettierMarcel van Remmerden
2019-04-02Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jarv/dev-to-gitl...John Jarvis
2019-03-26Add .code to all tables holding diffsDouwe Maan
2019-03-07Fix XSS in resolve conflicts formPaul Slaughter
2018-12-20Code style changes and refactorHeinrich Lee Yu
2018-12-19Pass in just assignees instead of issuableHeinrich Lee Yu
2018-12-19Refactor sidebar to use data from serializerHeinrich Lee Yu
2018-07-20Replace label-light with label-bold. Because it's bold, not lightAnnabel Dunstone Gray
2018-05-23Fix alignment of MR conflict resolutionAnnabel Dunstone Gray
2018-05-23Merge branch 'master' into bootstrap4Clement Ho
2018-05-22Fix sentence for i18nAnnabel Dunstone Gray
2018-05-21Add internationlization for conflict descriptionAnnabel Dunstone Gray
2018-05-21Update copy; add monospace font to branch namesAnnabel Dunstone Gray
2018-05-21Make source branch a linkAnnabel Dunstone Gray
2018-05-21Fix merge conflict infoAnnabel Dunstone Gray
2018-05-21Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray
2018-04-13[skip ci] Replace col-*-offset-* with offset-*-*Clement Ho
2018-04-12[skip ci] .form-horizontal => .form-group.rowClement Ho
2018-04-11[skip ci] .control-label to .col-form-labelClement Ho
2018-04-09Rename col-xs-* to col-*Clement Ho
2018-02-28remove merge_conflicts bundle in favor of pages directory entry pointMike Greiling
2018-02-19Chart.html.haml refactorJacob Schatz
2017-07-05Create and use project path helpers that only need a project, no namespaceDouwe Maan
2017-06-29Split up MergeRequestsControllerDouwe Maan
2017-06-15Add a bunch of missing translationsBob Van Landuyt
2017-02-02removes old css class from everywhereNur Rony
2016-12-31HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya
2016-12-31HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya
2016-11-10Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran
2016-11-10VueJSMigration: Remove parallel-conflict-line component.Fatih Acet
2016-11-10VueJS migration, replace {{{ with v-htmlFatih Acet
2016-10-13Fix discard messageAlfredo Sumaran
2016-10-13Improve components for PhantomJs compatibilityAlfredo Sumaran
2016-10-13Improve diff view switching and componentsAlfredo Sumaran
2016-10-13Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran
2016-10-13Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran
2016-10-13Refactor JS codeAlfredo Sumaran
2016-10-13Replace loading text with spinnerAlfredo Sumaran
2016-10-13Style for resolve conflicts formAlfredo Sumaran
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-09 11:45:58 +0300