Vinnie Okada 5a8d8b6f20 Merge branch 'master' into rails-4.1.9 ... Conflicts: app/views/dashboard/projects.html.haml		2015-02-22 07:55:30 -07:00
..
assets	Create Aside js class for handling all sidebars in UI for mobile devices	2015-02-21 22:01:27 -08:00
controllers	Merge branch 'master' into rails-4.1.9	2015-02-21 12:55:28 -07:00
finders	Fix trending projects ordering	2015-02-18 22:23:24 -08:00
helpers	Merge branch 'master' into rails-4.1.9	2015-02-19 20:53:05 -07:00
mailers	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
models	Merge branch 'master' into rails-4.1.9	2015-02-21 12:55:28 -07:00
services	Merge branch 'master' into rails-4.1.9	2015-02-21 12:55:28 -07:00
uploaders	Revert "Fix broken access control and refactor avatar upload"	2015-02-19 08:57:35 -08:00
views	Merge branch 'master' into rails-4.1.9	2015-02-22 07:55:30 -07:00
workers	gitlab.com importer: refactorig	2015-02-05 17:03:43 -08:00