summaryrefslogtreecommitdiff
path: root/lib/gitlab/conflict
Commit message (Expand)AuthorAgeFilesLines
* Simplify conflict resolution interface and codegitaly-conflict-resolverAlejandro Rodríguez2018-01-021-3/+4
* Simplify conflict resolver interfacegitaly-conflicts-prepAlejandro Rodríguez2017-12-141-3/+3
* Use memoization for commits on diffsZeger-Jan van de Weg2017-12-121-0/+2
* Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-121-12/+1
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-122-6/+9
* Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-124-227/+38
* Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-121-1/+1
* Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-121-13/+49
* Decrease Cyclomatic Complexity threshold to 13Maxim Rydkin2017-09-121-9/+19
* Prepare GitOperationService for move to Gitlab::GitJacob Vosmaer2017-08-311-1/+1
* Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-071-2/+2
* Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-productionDouwe Maan2017-07-071-1/+1
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-8/+5
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-3/+3
* Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-8/+34
* Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8Sean McGivern2017-03-151-5/+3
* Enable and autocorrect the CustomErrorClass copSean McGivern2017-03-014-22/+9
* Fix code for copsDouwe Maan2017-02-231-5/+6
* Enable Style/ConditionalAssignmentDouwe Maan2017-02-231-3/+3
* Add blob_ace_mode to conflict content responseSean McGivern2016-10-131-0/+5
* Simplify conflict file JSON creationSean McGivern2016-10-131-7/+15
* Allow setting content for resolutionsSean McGivern2016-10-134-13/+63
* Fix merge conflict size limitfix-allowed-conflict-sizeSean McGivern2016-09-071-1/+1
* Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-...Robert Speicher2016-08-251-0/+9
|\
| * Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-251-0/+9
* | Handle case where conflicts aren't on disk yetSean McGivern2016-08-251-0/+11
|/
* Fix bug where conflict view would have one too many context sectionsDouwe Maan2016-08-121-2/+4
* Find match line headers by backtrackingSean McGivern2016-08-121-11/+24
* Add more tests for conflictsSean McGivern2016-08-121-1/+1
* Move resolving code to ResolveServiceSean McGivern2016-08-122-29/+0
* Clarify Conflict::File#sections methodSean McGivern2016-08-121-3/+19
* Don't allow resolving invalid conflictsSean McGivern2016-08-121-2/+2
* Add blob_icon to conflict file JSONSean McGivern2016-08-121-2/+4
* Add blob_path to conflict file JSONSean McGivern2016-08-122-4/+10
* Use same resolution format on FE and BESean McGivern2016-08-122-4/+5
* Fix specsSean McGivern2016-08-123-15/+10
* Fix match line headers at start / end of fileSean McGivern2016-08-121-16/+33
* Handle case where one side deleted the fileSean McGivern2016-08-121-3/+5
* Highlight files based on merged fileSean McGivern2016-08-121-2/+5
* Remove unneeded raiseSean McGivern2016-08-121-3/+0
* Add match line headersSean McGivern2016-08-121-1/+8
* Raise errors for large and binary filesSean McGivern2016-08-121-1/+5
* Handle conflict resolution errors in controllerSean McGivern2016-08-122-7/+10
* Fix MR conflict resolution commitsSean McGivern2016-08-121-1/+1
* Auto-highlight conflict when rich_text is calledSean McGivern2016-08-122-11/+8
* Fix merge conflict reading for new diffsSean McGivern2016-08-121-1/+1
* Allow resolving conflicts in MR controllerSean McGivern2016-08-122-1/+63
* Handle multiple merge conflict files in collectionSean McGivern2016-08-123-14/+71
* Add backend for merge conflicts readingSean McGivern2016-08-122-0/+150
View Lorry Controller Status