4 commits

Author	SHA1	Message	Date
Mike Greiling	94d5dd3b7b	remove merge_conflicts bundle in favor of pages directory entry point	2018-02-27 16:51:12 -06:00
Jacob Schatz	834f455b43	Chart.html.haml refactor	2018-02-19 20:43:10 +00:00
Douwe Maan	fe13f11041	Create and use project path helpers that only need a project, no namespace	2017-07-05 11:11:59 -05:00
Douwe Maan	70b05a8377	Split up MergeRequestsController	2017-06-28 18:17:44 -05:00