Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview ...

Conflicts:
	spec/routing/project_routing_spec.rb

2014-12-07 20:25:58 -07:00

..

assets

Merge branch 'upstream-master' into markdown-preview

2014-12-07 20:25:58 -07:00

controllers

Merge branch 'upstream-master' into markdown-preview

2014-12-07 20:25:58 -07:00

finders

Add author filter for issues & merge requests pages

2014-12-05 17:13:07 +02:00

helpers

DRY and refactor atom code

2014-12-04 22:14:20 +02:00

mailers

Add rake task for google schema whitelisting.

2014-12-04 15:22:10 +01:00

models

Execute project services asynchronously

2014-12-07 12:29:37 +02:00

services

Merge branch 'prevent-500-test-webhook' into 'master'

2014-12-04 16:03:42 +00:00

uploaders

Revert "Merge pull request #7349 from srna/patch-1"

2014-12-05 15:33:22 +01:00

views

Merge branch 'upstream-master' into markdown-preview

2014-12-07 20:25:58 -07:00

workers

Execute project services asynchronously

2014-12-07 12:29:37 +02:00