match latest config from https://cipherli.st/

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>

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

Fix ldap check

Fixes gitlab/gitlabhq#1691

See merge request !1206

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

Update LDAP documentation

See merge request !1199

Slack team name

Fixes a problem in slack team name with hyphens.

https://gitlab.com/gitlab-org/gitlab-ce/issues/701

See merge request !1204

Improve grack auth hooks comment.

fix permission issue in upgrade guide

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

Conflicts:
	CHANGELOG

Add Hipchat services API

Manual merge of https://github.com/gitlabhq/gitlabhq/pull/7633

See merge request !1202

Remove unused admin/projects#repository method

Add timezone configuration to gitlab.yml

Factor admin logs [failure unrelated]

Remove unused filter from ProjectsController

Already defined on the ApplicationController base class.

Remove unused dev_tools helper.

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

Conflicts:
	CHANGELOG

Factor authorize_push! and authorize_code_access!

Replace match with end_with: more readable, faster

Use @project on controllers, don't call method

Remove param[:project_id] at admin controller

Factor group forms

DRY mentioned in magic note constant

State on CONTRIBUTING that people should fix line style of touched lines

Export all coffee classes with @

Factor choose group avatar button

Factor group tips