Douwe Maan 8fb49a4b70 Merge branch 'master' into merge-if-green ...

# Conflicts:
#	app/views/projects/merge_requests/widget/_heading.html.haml
#	app/views/projects/merge_requests/widget/open/_accept.html.haml

2015-12-08 22:34:03 +01:00

..

assets

Merge branch 'master' into merge-if-green

2015-12-08 22:34:03 +01:00

controllers

Merge branch 'master' into merge-if-green

2015-12-08 22:34:03 +01:00

finders

sort milestones by due_date

2015-12-03 08:53:34 -06:00

helpers

Merge remote-tracking branch 'origin/ui/misc'

2015-12-08 18:50:02 +01:00

mailers

Migrate mailers to ActiveJob

2015-11-26 17:03:43 +02:00

models

Merge branch 'master' into merge-if-green

2015-12-08 22:34:03 +01:00

services

Merge branch 'master' into zj/gitlab-ce-merge-if-green

2015-12-08 13:43:45 +01:00

uploaders

Expose artifacts path

2015-11-23 13:05:22 +01:00

validators

Inline Gitlab::Blacklist in NamespaceValidator

2015-12-07 16:57:26 -05:00

views

Merge branch 'master' into merge-if-green

2015-12-08 22:34:03 +01:00

workers

Merge branch 'master' into zj/gitlab-ce-merge-if-green

2015-12-08 13:43:45 +01:00