summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts
Commit message (Expand)AuthorAgeFilesLines
* removes old css class from everywhere27291-unify-mr-diff-file-buttonsNur Rony2017-02-021-1/+1
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-314-16/+16
* HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya2016-12-311-1/+1
* Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran2016-11-102-22/+0
* VueJSMigration: Remove parallel-conflict-line component.Fatih Acet2016-11-101-1/+10
* VueJS migration, replace {{{ with v-htmlFatih Acet2016-11-102-5/+3
* Fix discard messageAlfredo Sumaran2016-10-131-1/+1
* Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-138-50/+39
* Improve diff view switching and componentsAlfredo Sumaran2016-10-134-54/+34
* Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran2016-10-131-1/+1
* Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-134-25/+26
* Refactor JS codeAlfredo Sumaran2016-10-132-4/+3
* Replace loading text with spinnerAlfredo Sumaran2016-10-131-1/+2
* Style for resolve conflicts formAlfredo Sumaran2016-10-131-10/+17
* Styles for discard alertAlfredo Sumaran2016-10-131-3/+4
* Replace textarea with Ace editorAlfredo Sumaran2016-10-131-1/+1
* Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-136-19/+37
* Fix hard coded plural text.Fatih Acet2016-08-131-1/+1
* 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
* Minor code style tweaks in viewsDouwe Maan2016-08-122-12/+12
* “Showing N conflicts for A into B” -> “Showing N conflicts between A an...Douwe Maan2016-08-121-2/+2
* Don’t hardcode pathsDouwe Maan2016-08-121-3/+1
* Separate inline haml vue templates into new files.Fatih Acet2016-08-124-0/+93
View Lorry Controller Status