summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests/conflicts_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Use wait_for_requests to wait all JS requestwait-for-ajax-handling-all-js-requestsOswaldo Ferreira2017-05-221-11/+11
* Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-101-1/+1
* Unnecessary "include WaitForAjax" and "include ApiHelpers"Jacopo2017-04-211-2/+0
* Enable Style/MutableConstantDouwe Maan2017-02-231-1/+1
* Fix failing conflicts testAnnabel Dunstone Gray2017-02-101-1/+1
* Reduce base font sizes across appreduce-font-sizeAnnabel Dunstone Gray2016-12-021-1/+1
* Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-131-49/+96
* Improve diff view switching and componentsAlfredo Sumaran2016-10-131-5/+5
* Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-131-1/+37
* Refactor JS codeAlfredo Sumaran2016-10-131-2/+2
* Fix editor specSean McGivern2016-10-131-0/+1
* Add tests to check if files are resolved with Edit Inline modeAlfredo Sumaran2016-10-131-0/+26
* We now support resolving conflicts with ambiguous markersDouwe Maan2016-10-131-1/+0
* Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-251-1/+2
* Add workaround for JS error in specSean McGivern2016-08-171-1/+5
* Fix failed test because of a copy change.Fatih Acet2016-08-121-1/+1
* Add more tests for conflictsSean McGivern2016-08-121-0/+68