Dmitriy Zaporozhets 0e45bf5431 Merge branch '6-6-stable' of dev.gitlab.org:gitlab/gitlabhq ...

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

Conflicts:
	VERSION
	doc/install/installation.md

2014-02-24 12:46:25 +02:00

..

assets

Merge branch '6-6-stable' of dev.gitlab.org:gitlab/gitlabhq

2014-02-24 12:46:25 +02:00

controllers

UI and controller for group members access reset

2014-02-20 12:26:48 +02:00

helpers

UI and controller for group members access reset

2014-02-20 12:26:48 +02:00

mailers

Add email aliases for users

2014-02-13 22:59:39 -06:00

models

Merge branch '6-6-stable' of dev.gitlab.org:gitlab/gitlabhq

2014-02-24 12:46:25 +02:00

observers

Add email aliases for users

2014-02-13 22:59:39 -06:00

services

Merge branch '6-6-stable' of dev.gitlab.org:gitlab/gitlabhq

2014-02-24 12:46:25 +02:00

uploaders

Expire event cache on avatar creation/removal

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

views

Improve wording for reset button

2014-02-20 13:40:58 +02:00

workers

Improve compare logic for EmailOnPush service

2014-02-12 12:56:13 +02:00