Marin Jankovski 51349ca3c8 Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq into mattes-go-get-workaround-nginx ...

Conflicts:
	lib/support/nginx/gitlab
	lib/support/nginx/gitlab-ssl

2015-02-20 15:47:34 -08:00

..

assets

Fix commits calendar vertical days.

2015-02-20 14:35:29 +01:00

controllers

Merge branch 'upload-xss-access-control' into 'master'

2015-02-20 22:47:54 +00:00

finders

Fix trending projects ordering

2015-02-18 22:23:24 -08:00

helpers

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

2015-02-18 10:12:18 -08:00

mailers

Merge pull request #8749 from sashkab/b8748-emailheader

2015-02-08 01:06:38 -08:00

models

Merge branch 'projects-limit-default' into 'master'

2015-02-19 20:48:49 +00:00

services

Base new MR description on commit description if there's only one.

2015-02-20 22:17:38 +01:00

uploaders

Revert "Fix broken access control and refactor avatar upload"

2015-02-19 08:57:35 -08:00

views

Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq into mattes-go-get-workaround-nginx

2015-02-20 15:47:34 -08:00

workers

gitlab.com importer: refactorig

2015-02-05 17:03:43 -08:00