delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42	GitLab Bot	2021-08-19	1	-2/+2
*	Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42	GitLab Bot	2020-10-21	1	-3/+5
*	Enable even more frozen string in lib/gitlab	gfyoung	2018-11-06	1	-0/+2
*	Fix 500 error when trying to resolve non-ASCII conflicts in editor	Sean McGivern	2018-03-23	1	-1/+4
*	Cache `#can_be_resolved_in_ui?` git operationscache-refactor	Alejandro Rodríguez	2018-03-08	1	-2/+30
*	Simplify conflict resolution interface and codegitaly-conflict-resolver	Alejandro Rodríguez	2018-01-02	1	-3/+4
*	Simplify conflict resolver interfacegitaly-conflicts-prep	Alejandro Rodríguez	2017-12-14	1	-3/+3
*	Use memoization for commits on diffs	Zeger-Jan van de Weg	2017-12-12	1	-0/+2
*	Create a Gitlab::Git submodule for conlict-related files	Alejandro Rodríguez	2017-10-12	1	-4/+4
*	Refactor conflict resolution to contain git ops within Gitlab::Git	Alejandro Rodríguez	2017-10-12	1	-83/+19
*	Encapsulate git operations for conflict resolution into lib	Alejandro Rodríguez	2017-10-12	1	-13/+49
*	Prepare GitOperationService for move to Gitlab::Git	Jacob Vosmaer	2017-08-31	1	-1/+1
*	Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commit	Alejandro Rodríguez	2017-08-07	1	-2/+2
*	Enable Style/DotPosition Rubocop :cop:	Grzegorz Bizon	2017-06-21	1	-3/+3
*	Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos	Sean McGivern	2017-05-12	1	-8/+34
*	Enable and autocorrect the CustomErrorClass cop	Sean McGivern	2017-03-01	1	-2/+1
*	Allow setting content for resolutions	Sean McGivern	2016-10-13	1	-0/+4
*	Add more tests for conflicts	Sean McGivern	2016-08-12	1	-1/+1
*	Move resolving code to ResolveService	Sean McGivern	2016-08-12	1	-21/+0
*	Add blob_path to conflict file JSON	Sean McGivern	2016-08-12	1	-1/+1
*	Use same resolution format on FE and BE	Sean McGivern	2016-08-12	1	-2/+3
*	Fix specs	Sean McGivern	2016-08-12	1	-1/+0
*	Handle case where one side deleted the file	Sean McGivern	2016-08-12	1	-3/+5
*	Remove unneeded raise	Sean McGivern	2016-08-12	1	-3/+0
*	Fix MR conflict resolution commits	Sean McGivern	2016-08-12	1	-1/+1
*	Fix merge conflict reading for new diffs	Sean McGivern	2016-08-12	1	-1/+1
*	Allow resolving conflicts in MR controller	Sean McGivern	2016-08-12	1	-0/+20
*	Handle multiple merge conflict files in collection	Sean McGivern	2016-08-12	1	-0/+59