Dmitriy Zaporozhets da86eace5c Merge branch 'sync_ldap_members' into ee-master ...

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

Conflicts:
	CHANGELOG-EE

2014-11-03 15:43:42 +02:00

..

assets

Merge branch 'ce-ee-master' into ee-master

2014-10-22 14:47:04 +03:00

controllers

Git Hook to check whether author is a GitLab member

2014-10-31 16:19:58 +02:00

finders

internal snippets: fix exposing of title

2014-10-24 19:44:42 +03:00

helpers

Merge branch 'feature-multi-ldap-servers-merge-master' into feature-multi-ldap-servers-group-sync

2014-10-15 14:50:24 +02:00

mailers

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +03:00

models

git hook: code style

2014-11-03 14:41:07 +02:00

services

Merge branch '7-4-stable' into ee_stable

2014-10-21 13:48:16 +03:00

uploaders

Make existing tests test something, return correct errors.

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

views

Git Hook to check whether author is a GitLab member

2014-10-31 16:19:58 +02:00

workers

Place the settings that are valid for all ldap servers in a correct place.

2014-10-31 12:40:01 +01:00