summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflict_resolver.js.es6
Commit message (Expand)AuthorAgeFilesLines
* ensure the 'fixed layout' preference is honored whenever possibleMike Greiling2016-09-201-3/+2
* Keep committing ... spinner when conflict resolvedkeep-committing-spinner-when-conflict-resolvedSean McGivern2016-08-191-3/+1
* Use bundled Vue libmc-uiSean McGivern2016-08-171-1/+1
* Remove commit button loader and update title while committing.Fatih Acet2016-08-121-2/+3
* Remove unnecessary window exports.Fatih Acet2016-08-121-1/+1
* Don’t hardcode pathsDouwe Maan2016-08-121-2/+2
* Dynamically highlight code blocks in merge conflicts widgets.Fatih Acet2016-08-121-4/+9
* Update container fludity class if diff view mode is parallel.Fatih Acet2016-08-121-0/+3
* Show loading button while Ajax request is in progress.Fatih Acet2016-08-121-12/+21
* Set flash message after conflict is resolvedSean McGivern2016-08-121-2/+2
* Implement commit in merge conflicts UI.Fatih Acet2016-08-121-0/+10
* Render right sidebar and handle request error.Fatih Acet2016-08-121-4/+12
* Check line lengths and fill missing lines with empty lines.Fatih Acet2016-08-121-0/+2
* Added ES6 MergeConflictResolver classes.Fatih Acet2016-08-121-0/+47