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/_submit_form.html.haml
AgeCommit message (Expand)Author
2019-03-07Fix XSS in resolve conflicts formPaul Slaughter
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
2017-07-05Create and use project path helpers that only need a project, no namespaceDouwe Maan
2017-06-15Add a bunch of missing translationsBob Van Landuyt
2016-12-31HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya
2016-10-13Refactor JS codeAlfredo Sumaran
2016-10-13Style for resolve conflicts formAlfredo Sumaran
2016-10-13Implement editor to manually resolve merge conflictsAlfredo Sumaran
2016-08-12Disable commit button if commit message textarea empty.Fatih Acet
2016-08-12Remove commit button loader and update title while committing.Fatih Acet
2016-08-12Don’t hardcode pathsDouwe Maan
2016-08-12Separate inline haml vue templates into new files.Fatih Acet
    generated by cgit v1.2.3 (git 2.25.1) at 2024-08-10 14:49:15 +0300