Conflicts:
	VERSION

Add 7.4.2-ee packages

See merge request !220

Fix internal snippets

See merge request !219

Conflicts:
	CHANGELOG
	VERSION

Add 7.4.1-ee packages

See merge request !218

CE stable to EE

conflict in lib/gitlab/ldap/adapter.rb should be resolved

See merge request !217

Conflicts:
	VERSION
	lib/gitlab/ldap/adapter.rb

Conflicts:
	CHANGELOG

Fix 500 error on login page if ldap enabled and sign-in disabled

Related to gitlab/gitlabhq#1701

See merge request !1209

Fix 500 error on login page if ldap enabled and sign-in disabled

Related to gitlab/gitlabhq#1701

See merge request !1209

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

Conflicts:
	VERSION
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb

7-4 stable-ee to master

See merge request !212

Improve ldap check for old syntax [stable]

See merge request !215

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

Fix ldap check [stable]

See merge request !214

Fix ldap check [stable]

Fix ldap check for stable branch

See merge request !1208

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

Conflicts:
	lib/gitlab/ldap/adapter.rb

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

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

Add reference to the README  to upgrade guide CE to EE

Issue - https://dev.gitlab.org/gitlab/gitlab-ee/issues/183

See merge request !213

Add instructions for multiple LDAP servers

See merge request !211

WIP. CE stable to EE stable

```
Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   config/initializers/1_settings.rb
	both modified:   config/initializers/7_omniauth.rb
	both modified:   features/admin/groups.feature
	both modified:   features/steps/admin/groups.rb

```

@jacobvosmaer There are 4 conflicts. Two of them (last two ones) I merged by myself. In other cases your help would be appreciated.

See merge request !209