summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/conflict
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42GitLab Bot2022-10-201-13/+14
* Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42GitLab Bot2021-08-191-0/+35
* Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42GitLab Bot2021-05-191-6/+6
* Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43GitLab Bot2021-04-201-3/+3
* Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42Robert Speicher2021-01-201-12/+20
* Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42GitLab Bot2020-11-191-0/+45
* Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42GitLab Bot2020-10-211-1/+1
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-07-202-2/+2
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-041-73/+73
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-01-271-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-181-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-171-1/+1
* Add frozen_string_literal to spec/lib (part 1)Thong Kuah2019-07-262-0/+4
* Remove dependencies on LinguistZeger-Jan van de Weg2018-10-121-5/+0
* Remove Gitlab::Git::Repository#rugged and Gollum codeAlejandro Rodríguez2018-10-021-1/+3
* Include rich_text in diff cache keysSean McGivern2018-08-281-4/+0
* Add "deny disk access" Gitaly feature (tripswitch)Jacob Vosmaer (GitLab)2018-06-011-1/+1
* Cache `#can_be_resolved_in_ui?` git operationscache-refactorAlejandro Rodríguez2018-03-081-0/+32
* Fix conflict highlightingfix-conflict-highlightingSean McGivern2017-11-171-0/+7
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-4/+4
* Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-123-232/+10
* Use described_class when possibleRémy Coutable2017-07-272-3/+3
* Remove superfluous lib: true, type: redis, service: true, models: true, servi...Rémy Coutable2017-07-273-3/+3
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-212-44/+44
* Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-1/+1
* Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8Sean McGivern2017-03-151-30/+59
* Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-231-1/+1
* Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-232-42/+42
* Enable Style/WordArrayDouwe Maan2017-02-231-2/+2
* Prefer leading style for Style/DotPositionDouwe Maan2017-02-232-42/+42
* Use `:empty_project` where possible throughout spec/librs-empty_project-libRobert Speicher2017-01-251-1/+1
* Add blob_ace_mode to conflict content responseSean McGivern2016-10-131-0/+11
* Fix merge conflict size limitfix-allowed-conflict-sizeSean McGivern2016-09-071-2/+2
* Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-251-0/+5
* Find match line headers by backtrackingSean McGivern2016-08-121-0/+104
* Add more tests for conflictsSean McGivern2016-08-122-5/+5
* Clarify Conflict::File#sections methodSean McGivern2016-08-121-11/+12
* Add blob_icon to conflict file JSONSean McGivern2016-08-121-0/+4
* Add blob_path to conflict file JSONSean McGivern2016-08-121-1/+9
* Use same resolution format on FE and BESean McGivern2016-08-121-2/+2
* Fix specsSean McGivern2016-08-121-3/+2
* Raise errors for large and binary filesSean McGivern2016-08-121-9/+17
* Auto-highlight conflict when rich_text is calledSean McGivern2016-08-121-5/+11
* Allow resolving conflicts in MR controllerSean McGivern2016-08-121-0/+66
* Handle multiple merge conflict files in collectionSean McGivern2016-08-123-12/+35
* Add backend for merge conflicts readingSean McGivern2016-08-122-0/+254
View Lorry Controller Status