Dmitriy Zaporozhets 1af8b1e4f8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html

2015-05-15 13:29:58 +03:00

..

assets

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-05-15 13:29:58 +03:00

controllers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-05-15 13:29:58 +03:00

finders

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

2015-05-05 10:18:27 +02:00

helpers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-05-15 13:29:58 +03:00

mailers

Revert "Allow to configure smtp and sendmail in gitlab.yml"

2015-05-06 17:39:18 +03:00

models

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-05-15 13:29:58 +03:00

services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-05-15 13:29:58 +03:00

uploaders

Fix URL to uploaded file.

2015-02-20 16:01:37 +01:00

views

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-05-15 13:29:58 +03:00

workers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-05-13 14:10:14 +03:00