Dmitriy Zaporozhets 1f43fa20d3 Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/controllers/application_controller.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.2-to-6.3.md

2013-12-23 12:57:22 +02:00

..

assets

Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce

2013-12-23 12:57:22 +02:00

contexts

Update repository head successively during project update

2013-12-16 19:34:56 +02:00

controllers

Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce

2013-12-23 12:57:22 +02:00

helpers

Update default public pull url.

2013-12-17 12:48:59 -06:00

mailers

Email on push: dont send email if new branch was pushed or branch was removed

2013-12-17 16:20:45 +02:00

models

Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce

2013-12-23 12:57:22 +02:00

observers

Added hook execution to reopened e updated merge requests

2013-12-19 13:25:50 -02:00

services

Execute project hooks when issue or merge request created

2013-12-04 13:37:17 +02:00

uploaders

Expire event cache on avatar creation/removal

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

views

Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce

2013-12-23 12:57:22 +02:00

workers

Move EmailOnPush logic to async worker

2013-12-18 13:42:12 +02:00