Dmitriy Zaporozhets f0dd16d53e Merge branch 'master' of github.com:gitlabhq/gitlabhq ...

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

Conflicts:
	CHANGELOG

2014-10-30 16:17:36 +02:00

..

assets

Merge branch 'feature_password_strength_indicator' into 'master'

2014-10-30 11:32:11 +00:00

controllers

Add Atlassian Bamboo service

2014-10-28 05:20:36 -05:00

finders

Merge branch 'dashboard_issues_and_mr' into 'master'

2014-10-28 13:38:41 +00:00

helpers

Add refactoring for multiple LDAP server support

2014-10-13 13:39:54 +02:00

mailers

Fix adminarea and emails for new membership logic

2014-09-15 10:57:02 +03:00

models

Mentioned users are not limited by project scope any more

2014-10-30 13:26:45 +02:00

services

Mentioned users are not limited by project scope any more

2014-10-30 13:26:45 +02:00

uploaders

Make existing tests test something, return correct errors.

2014-05-26 14:17:46 +02:00

views

Merge branch 'master' of github.com:gitlabhq/gitlabhq

2014-10-30 16:17:36 +02:00

workers

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +02:00