summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts/_inline_view.html.haml
Commit message (Expand)AuthorAgeFilesLines
* Improve diff view switching and componentsAlfredo Sumaran2016-10-131-29/+0
* Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-131-19/+22
* Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-131-6/+4
* Minor code style tweaks in viewsDouwe Maan2016-08-121-7/+6
* Separate inline haml vue templates into new files.Fatih Acet2016-08-121-0/+29