summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
Commit message (Expand)AuthorAgeFilesLines
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-1/+1
* Add a bunch of missing translationsBob Van Landuyt2017-06-151-1/+1
* HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya2016-12-311-1/+1
* Refactor JS codeAlfredo Sumaran2016-10-131-1/+0
* Style for resolve conflicts formAlfredo Sumaran2016-10-131-10/+17
* Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-131-7/+2
* Disable commit button if commit message textarea empty.Fatih Acet2016-08-121-3/+2
* Remove commit button loader and update title while committing.Fatih Acet2016-08-121-1/+1
* Don’t hardcode pathsDouwe Maan2016-08-121-3/+1
* Separate inline haml vue templates into new files.Fatih Acet2016-08-121-0/+18