summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts.html.haml
Commit message (Expand)AuthorAgeFilesLines
* Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-131-16/+8
* Improve diff view switching and componentsAlfredo Sumaran2016-10-131-2/+15
* Refactor JS codeAlfredo Sumaran2016-10-131-1/+2
* Replace textarea with Ace editorAlfredo Sumaran2016-10-131-0/+2
* Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-131-0/+3
* Don’t hardcode pathsDouwe Maan2016-08-121-1/+2
* Show appropriate message when conflicts have already been resolvedDouwe Maan2016-08-121-6/+6
* Separate inline haml vue templates into new files.Fatih Acet2016-08-121-107/+11
* Simplify Haml template and Scss files for MC UI.Fatih Acet2016-08-121-36/+23
* Dynamically highlight code blocks in merge conflicts widgets.Fatih Acet2016-08-121-1/+1
* Update button titles in merge conflicts widget header.Fatih Acet2016-08-121-2/+4
* Show loading button while Ajax request is in progress.Fatih Acet2016-08-121-4/+6
* Prefer v-show instead of v-if.Fatih Acet2016-08-121-2/+2
* Add file icon and blob link.Fatih Acet2016-08-121-4/+6
* Draw side-by-side view only one table.Fatih Acet2016-08-121-22/+33
* Put file blob link as href.Fatih Acet2016-08-121-2/+4
* Handle renamed files in file header.Fatih Acet2016-08-121-2/+3
* Add v-cloak to parent Vue element for MCUI.Fatih Acet2016-08-121-1/+1
* Implement commit in merge conflicts UI.Fatih Acet2016-08-121-4/+5
* Render right sidebar and handle request error.Fatih Acet2016-08-121-0/+116