summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflict_data_provider.js.es6
Commit message (Expand)AuthorAgeFilesLines
* Fix hard coded plural text.Fatih Acet2016-08-131-1/+3
* Disable commit button if commit message textarea empty.Fatih Acet2016-08-121-2/+8
* Remove commit button loader and update title while committing.Fatih Acet2016-08-121-0/+7
* Remove unnecessary window exports.Fatih Acet2016-08-121-2/+2
* Change left and right position for parallel lines.Fatih Acet2016-08-121-2/+2
* Update button titles in merge conflicts widget header.Fatih Acet2016-08-121-2/+7
* Show loading button while Ajax request is in progress.Fatih Acet2016-08-121-2/+4
* Add file icon and blob link.Fatih Acet2016-08-121-3/+7
* Draw side-by-side view only one table.Fatih Acet2016-08-121-21/+33
* Handle renamed files in file header.Fatih Acet2016-08-121-0/+8
* Use same resolution format on FE and BESean McGivern2016-08-121-1/+1
* Implement commit in merge conflicts UI.Fatih Acet2016-08-121-1/+9
* Render right sidebar and handle request error.Fatih Acet2016-08-121-6/+20
* Check line lengths and fill missing lines with empty lines.Fatih Acet2016-08-121-9/+32
* Refactor data parser to remove duplicated objects.Fatih Acet2016-08-121-8/+25
* Fixes for match lines in parallel view.Fatih Acet2016-08-121-2/+4
* Added ES6 MergeConflictResolver classes.Fatih Acet2016-08-121-0/+231