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

	Commit message (Expand)	Author	Age	Files	Lines
*	Remove dependencies on Linguist	Zeger-Jan van de Weg	2018-10-12	1	-5/+0
*	Remove Gitlab::Git::Repository#rugged and Gollum code	Alejandro Rodríguez	2018-10-02	1	-1/+3
*	Include rich_text in diff cache keys	Sean McGivern	2018-08-28	1	-4/+0
*	Add "deny disk access" Gitaly feature (tripswitch)	Jacob Vosmaer (GitLab)	2018-06-01	1	-1/+1
*	Cache `#can_be_resolved_in_ui?` git operationscache-refactor	Alejandro Rodríguez	2018-03-08	1	-0/+32
*	Fix conflict highlightingfix-conflict-highlighting	Sean McGivern	2017-11-17	1	-0/+7
*	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	3	-232/+10
*	Use described_class when possible	Rémy Coutable	2017-07-27	2	-3/+3
*	Remove superfluous lib: true, type: redis, service: true, models: true, servi...	Rémy Coutable	2017-07-27	3	-3/+3
*	Enable Style/DotPosition Rubocop :cop:	Grzegorz Bizon	2017-06-21	2	-44/+44
*	Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos	Sean McGivern	2017-05-12	1	-1/+1
*	Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8	Sean McGivern	2017-03-15	1	-30/+59
*	Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-path	Douwe Maan	2017-02-23	1	-1/+1
*	Revert "Prefer leading style for Style/DotPosition"	Douwe Maan	2017-02-23	2	-42/+42
*	Enable Style/WordArray	Douwe Maan	2017-02-23	1	-2/+2
*	Prefer leading style for Style/DotPosition	Douwe Maan	2017-02-23	2	-42/+42
*	Use `:empty_project` where possible throughout spec/librs-empty_project-lib	Robert Speicher	2017-01-25	1	-1/+1
*	Add blob_ace_mode to conflict content response	Sean McGivern	2016-10-13	1	-0/+11
*	Fix merge conflict size limitfix-allowed-conflict-size	Sean McGivern	2016-09-07	1	-2/+2
*	Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data	Sean McGivern	2016-08-25	1	-0/+5
*	Find match line headers by backtracking	Sean McGivern	2016-08-12	1	-0/+104
*	Add more tests for conflicts	Sean McGivern	2016-08-12	2	-5/+5
*	Clarify Conflict::File#sections method	Sean McGivern	2016-08-12	1	-11/+12
*	Add blob_icon to conflict file JSON	Sean McGivern	2016-08-12	1	-0/+4
*	Add blob_path to conflict file JSON	Sean McGivern	2016-08-12	1	-1/+9
*	Use same resolution format on FE and BE	Sean McGivern	2016-08-12	1	-2/+2
*	Fix specs	Sean McGivern	2016-08-12	1	-3/+2
*	Raise errors for large and binary files	Sean McGivern	2016-08-12	1	-9/+17
*	Auto-highlight conflict when rich_text is called	Sean McGivern	2016-08-12	1	-5/+11
*	Allow resolving conflicts in MR controller	Sean McGivern	2016-08-12	1	-0/+66
*	Handle multiple merge conflict files in collection	Sean McGivern	2016-08-12	3	-12/+35
*	Add backend for merge conflicts reading	Sean McGivern	2016-08-12	2	-0/+254