Having local changes is quite common and it is a stumbling block when
upgrading GitLab. Because schema.rb is generated from the actual DB
schema it is OK to clear the local changes.

Conflicts:
	CHANGELOG

Add active directory ldap option

Fixes #1557

See merge request !1139

Add Readme tab to project show page

Fixes #1533

See merge request !1140

Fix typo in link title

Remove statement without effect.

Fix dev merge seed: update testme to gitlab-test.

Email on push template changes

Fixes #1304

See merge request !1136

Remove trailing whitespace from views.

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>

Speed upgrade

/cc @jacobvosmaer @dzaporozhets

See merge request !1134

Improve backup uploader docs

See merge request !1137

Replace Gitlab::Git::GitStats

Merge branch 'api/issues-filter-milestone' of https://github.com/jubianchi/gitlabhq into jubianchi-api/issues-filter-milestone
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG

Fix network graph

Fix #1624

See merge request !1135

Prevent notes polling when there are not notes

See merge request !1132

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

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