gitlab-org--gitlab-foss/app
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
..
assets Fix active tab tests 2015-02-19 17:24:34 -08:00
controllers Merge branch 'master' into rails-4.1.9 2015-02-19 20:53:05 -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-19 20:53:05 -07:00
services Merge branch 'master' into rails-4.1.9 2015-02-19 20:53:05 -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-19 20:53:05 -07:00
workers gitlab.com importer: refactorig 2015-02-05 17:03:43 -08:00