Fatih Acet c9f94fec4d Change left and right position for parallel lines.		2016-08-12 23:24:51 +03:00
..
assets	Change left and right position for parallel lines.	2016-08-12 23:24:51 +03:00
controllers	Use a regular flash message after resolution is complete	2016-08-12 23:24:51 +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	Allow build email service to be tested	2016-07-15 20:38:27 -03:00
models	Verify user is signed in and can actually resolve conflicts	2016-08-12 23:24:50 +03:00
services	Move resolving code to ResolveService	2016-08-12 23:24:48 +03:00
uploaders	Remove magic comments from Ruby files (!5456)	2016-07-24 07:08:45 +02:00
validators	refactor url validator to use sanitizer for check	2016-07-01 09:02:45 +02:00
views	Fix bug where merge widget wouldn't show up after resolving conflicts	2016-08-12 23:24:51 +03:00
workers	Fix bug where destroying a namespace would not always destroy projects	2016-08-11 15:36:35 -07:00