Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb

Implement complete labels API (create/delete/update)

Fix commit msg

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

Better label color validation, fixes #7454

unfold commits

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

for commits#show

Improve logging for the JIRA issue closing service

See merge request !144

Remove labels via ajax

See merge request !1019

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

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

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

Add 7.1.1 patch release changelog

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

Conflicts:
	CHANGELOG

follow curl redirects

Patched `MergeRequest` to return more data.

prevent events duplication loading

Fix milestones description's max length

Fix 404 error when clicking the branch link on hipchat message

rtrim() input before checking if note form is empty

add git config --global core.autocrlf check

Restrict commit area resize to vertical.

Bump gitlab git

Fixes #1394

See merge request !1015

Cache LDAP check everywhere

Tested as follows:

- sign in LDAP user;
- disable access via LDAP (in this case, disable the account in AD);
- check that the user can still access Git via SSH;
- check that the user can still browse and do API calls (issue dropdown);
- set the last_credential_check_at attribute to 2 hours ago in the console;
- SSH access fails;
- API call returns 401.

If I try to sign in again after the LDAP account was disabled, the effect is immediate.

See merge request !139

Cache LDAP check everywhere

See merge request !1008

Feature admin emails

solves issue #126

One point remains. There is no clickable link to open the email page. Where should this link be communicated?!

# User Overview
![](https://dev.gitlab.org/uploads/gitlab/gitlab-ee/638fd79165/Screen_Shot_2014-08-12_at_17.30.53.png)

# Composing an email
![](https://dev.gitlab.org/uploads/gitlab/gitlab-ee/c07f753aec/Screen_Shot_2014-08-11_at_16.28.57.png)

# Unsubscribe
![](https://dev.gitlab.org/uploads/gitlab/gitlab-ee/db15c9f8b0/Screen_Shot_2014-08-12_at_17.32.27.png)

See merge request !140