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

	Commit message (Expand)	Author	Age	Files	Lines
*	Enable even more frozen string in lib/gitlabrepo-forks/gitlab-ce-frozen-string-lib-gitlab-even-more	gfyoung	2018-11-13	4	-0/+8
*	Move Repository#wrapped_gitaly_errors into concern	Bob Van Landuyt	2018-10-30	1	-2/+4
*	More Gitaly cleanup: fetch_ref, allow disk access blocks	Jacob Vosmaer (GitLab)	2018-07-27	1	-1/+1
*	Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'ma...	Jacob Vosmaer	2018-07-06	1	-65/+4
*	Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"	Jacob Vosmaer (GitLab)	2018-07-05	1	-4/+65
*	Make more Gitaly features mandatory	Jacob Vosmaer (GitLab)	2018-07-04	1	-65/+4
*	Fix 500 error when MR from fork has conflicts but worker has not runfix-500-error-when-mr-ref-is-not-yet-fetched	Sean McGivern	2018-04-06	1	-1/+1
*	Fix 500 error when trying to resolve non-ASCII conflicts in editor	Sean McGivern	2018-03-23	2	-8/+13
*	Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitaly	Ahmad Sherif	2018-01-11	1	-1/+1
*	Simplify conflict resolution interface and codegitaly-conflict-resolver	Alejandro Rodríguez	2018-01-02	3	-8/+25
*	Incorporate ConflictsService.ResolveConflicts Gitaly RPC	Alejandro Rodríguez	2017-12-27	1	-22/+36
*	Incorporate ConflictsService.ListConflictFiles Gitaly RPC	Alejandro Rodríguez	2017-12-27	1	-5/+19
*	Simplify conflict resolver interfacegitaly-conflicts-prep	Alejandro Rodríguez	2017-12-14	1	-30/+29
*	Use `String#end_with?` instead of `String#ends_with?`gitaly-conflict-file	Alejandro Rodríguez	2017-12-04	1	-1/+1
*	Add missing attr_accessor to Gitlab::Git::Conflict::File	Alejandro Rodríguez	2017-12-04	1	-1/+1
*	Move line code generation into Gitlab::Gitconflict-resolution-refactor	Alejandro Rodríguez	2017-10-12	2	-14/+3
*	Create a Gitlab::Git submodule for conlict-related files	Alejandro Rodríguez	2017-10-12	4	-0/+279