Alfredo Sumaran 54bfe70795 Add more tests to check conflicts resolution		2016-10-13 14:16:35 -05:00
..
assets	Add more tests to check conflicts resolution	2016-10-13 14:16:35 -05:00
controllers	Fix specs	2016-10-13 14:16:34 -05:00
finders	…
helpers	Merge branch 'feature/issues-board' into 'master'	2016-10-13 14:21:14 +00:00
mailers	…
models	Allow setting content for resolutions	2016-10-13 14:16:34 -05:00
policies	Make guests unable to view MRs	2016-10-11 16:51:26 +03:00
services	Allow setting content for resolutions	2016-10-13 14:16:34 -05:00
uploaders	…
validators	…
views	Improve components for PhantomJs compatibility	2016-10-13 14:16:35 -05:00
workers	Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelines	2016-10-12 11:52:54 +02:00