Sean McGivern f3cf40b8aa Handle case where one side deleted the file		2016-08-12 23:24:46 +03:00
..
assets	Check line lengths and fill missing lines with empty lines.	2016-08-12 23:24:45 +03:00
controllers	Handle case where one side deleted the file	2016-08-12 23:24:46 +03:00
finders	State specific default sort order for issuables	2016-08-01 11:28:56 +02:00
helpers	Added routes for conflicts in merge requests page.	2016-08-12 23:24:41 +03:00
mailers
models	Fix merge conflict reading for new diffs	2016-08-12 23:24:43 +03:00
services	Merge branch 'fix-namespace-deletion' into 'master'	2016-08-12 18:04:03 +00:00
uploaders	Remove magic comments from Ruby files (!5456)	2016-07-24 07:08:45 +02:00
validators
views	Remove Conflicts tab make it a page instead.	2016-08-12 23:24:45 +03:00
workers	Fix bug where destroying a namespace would not always destroy projects	2016-08-11 15:36:35 -07:00