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	2	-3/+8
*	Add latest changes from gitlab-org/gitlab@13-3-stable-ee	GitLab Bot	2020-08-20	1	-1/+1
*	Enable more frozen string in app/services/*/.rbrepo-forks/gitlab-ce-frozen-string-enable-apps-services-inner-more	gfyoung	2018-07-17	3	-0/+6
*	Cache `#can_be_resolved_in_ui?` git operationscache-refactor	Alejandro Rodríguez	2018-03-08	1	-9/+1
*	Incorporate ConflictsService.ListConflictFiles Gitaly RPC	Alejandro Rodríguez	2017-12-27	1	-1/+1
*	Create a Gitlab::Git submodule for conlict-related files	Alejandro Rodríguez	2017-10-12	1	-1/+1
*	Refactor conflict resolution to contain git ops within Gitlab::Git	Alejandro Rodríguez	2017-10-12	2	-3/+3
*	Encapsulate git operations for conflict resolution into lib	Alejandro Rodríguez	2017-10-12	1	-46/+2
*	Enable Style/DotPosition Rubocop :cop:	Grzegorz Bizon	2017-06-21	1	-4/+4
*	Keep trailing newline when picking conflict sections32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file	Sean McGivern	2017-06-01	1	-5/+7
*	Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing	Douwe Maan	2017-05-18	1	-0/+1
*	Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos	Sean McGivern	2017-05-12	3	-0/+99