Marin Jankovski 95ef8f9756 Merge remote-tracking branch 'ce/master' ...

Conflicts:
	VERSION
	doc/install/installation.md
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	lib/gitlab/markdown.rb
	spec/lib/gitlab/ldap/ldap_access_spec.rb

2014-05-21 13:10:37 +02:00

..

assets

Merge remote-tracking branch 'ce/master'

2014-05-21 13:10:37 +02:00

controllers

Merge remote-tracking branch 'ce/master'

2014-05-21 13:10:37 +02:00

finders

Default last_fetched_at to 0 for old clients

2014-04-28 16:39:42 +02:00

helpers

Dirty implementastion of MR build status for Jenkins

2014-05-15 10:34:35 +03:00

mailers

Merge pull request #6109 from jamit/master

2014-05-13 12:35:33 +03:00

models

Merge remote-tracking branch 'ce/master'

2014-05-21 13:10:37 +02:00

observers

Only send email when project access level changes.

2014-04-03 13:24:05 +02:00

services

Merge remote-tracking branch 'ce/master'

2014-05-21 13:10:37 +02:00

uploaders

Expire event cache on avatar creation/removal

2013-12-11 09:30:22 -06:00

views

Merge remote-tracking branch 'ce/master'

2014-05-21 13:10:37 +02:00

workers

Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout

2014-03-14 12:00:21 +02:00