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

	Commit message (Expand)	Author	Age	Files	Lines
*	Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-production	Douwe Maan	2017-07-07	1	-1/+1
*	Create and use project path helpers that only need a project, no namespace	Douwe Maan	2017-07-05	1	-8/+5
*	Enable and autocorrect the CustomErrorClass cop	Sean McGivern	2017-03-01	1	-2/+1
*	Fix code for cops	Douwe Maan	2017-02-23	1	-5/+6
*	Enable Style/ConditionalAssignment	Douwe Maan	2017-02-23	1	-3/+3
*	Add blob_ace_mode to conflict content response	Sean McGivern	2016-10-13	1	-0/+5
*	Simplify conflict file JSON creation	Sean McGivern	2016-10-13	1	-7/+15
*	Allow setting content for resolutions	Sean McGivern	2016-10-13	1	-8/+43
*	Handle case where conflicts aren't on disk yet	Sean McGivern	2016-08-25	1	-0/+11
*	Fix bug where conflict view would have one too many context sections	Douwe Maan	2016-08-12	1	-2/+4
*	Find match line headers by backtracking	Sean McGivern	2016-08-12	1	-11/+24
*	Move resolving code to ResolveService	Sean McGivern	2016-08-12	1	-8/+0
*	Clarify Conflict::File#sections method	Sean McGivern	2016-08-12	1	-3/+19
*	Don't allow resolving invalid conflicts	Sean McGivern	2016-08-12	1	-2/+2
*	Add blob_icon to conflict file JSON	Sean McGivern	2016-08-12	1	-2/+4
*	Add blob_path to conflict file JSON	Sean McGivern	2016-08-12	1	-3/+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	-11/+7
*	Fix match line headers at start / end of file	Sean McGivern	2016-08-12	1	-16/+33
*	Highlight files based on merged file	Sean McGivern	2016-08-12	1	-2/+5
*	Add match line headers	Sean McGivern	2016-08-12	1	-1/+8
*	Handle conflict resolution errors in controller	Sean McGivern	2016-08-12	1	-5/+5
*	Auto-highlight conflict when rich_text is called	Sean McGivern	2016-08-12	1	-8/+5
*	Allow resolving conflicts in MR controller	Sean McGivern	2016-08-12	1	-1/+43
*	Handle multiple merge conflict files in collection	Sean McGivern	2016-08-12	1	-8/+10
*	Add backend for merge conflicts reading	Sean McGivern	2016-08-12	1	-0/+91