Don't resend admin email to everyone if one delivery fails

Fixes gitlab/gitlabhq#2524

See merge request !462

Don't send "Added to group" notifications when group is LDAP synched

Addresses gitlab/gitlab-ee#313.

See merge request !463

Approvals improvements

https://dev.gitlab.org/gitlab/gitlab-ee/issues/326


* Fix approvals for forks. Now you can change approvals settings on the new merge request form
* Suggested approvers are shown on the new merge request form


See merge request !464

small typo

Fixed a small typo in the ldap documentation

See merge request !15

Fix group web_hooks

https://dev.gitlab.org/gitlab/gitlabhq/issues/2452

See merge request !438

Update changelog in master



See merge request !460

CE to EE



See merge request !457

# Conflicts:
#	README.md
#	app/controllers/projects_controller.rb
#	db/schema.rb
#	doc/workflow/README.md
#	lib/gitlab/satellite/merge_action.rb

Fix bug causing "Remove source-branch" option not to work for merge requests from the same project.

Fixes #2049.

See merge request !1025

Revert cache for events

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1014#note_1661322

See merge request !1027

Revert cache issue

It reverts https://dev.gitlab.org/gitlab/gitlabhq/commit/40e31e1db31e6ba9a1cd6255afc2f09df61f4060

and fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2048
and https://gitlab.com/gitlab-org/gitlab-ce/issues/2043

See merge request !1028

Fix link to 2fa help page.  Closes #2055

See merge request !1026

Check if session_expire_delay column exists before adding the column.

Fixes #2052 

Fixes #1985

See merge request !1029

revert caching of note text

This MR reverts the caching of note texts because what is rendered as a link in Markdown depends on the user's access to other projects and groups.

Until we find a solution that doesn't decrease security, let's not use the cache for this.

See discussion in gitlab-org/gitlab-ce!911 for more information.

/cc @DouweM @stanhu @vsizov

See merge request !1014

Speed up security feature specs

Before: `rspec spec/features/security/  0.12s user 0.04s system 0% cpu 3:38.00 total`

After: `rspec spec/features/security/  0.12s user 0.04s system 0% cpu 1:40.58 total`

The majority of the speed improvements is from two things:

1. Instead of using our standard `login_as` helper in the matchers, we take advantage
   of the `Warden::Test::Helpers` version of the method which bypasses the login form
   and logs the user in directly. We were essentially testing that filling out the login
   form works hundreds of times.
2. There were many tests that verified if a user of a certain access level
   (master, owner, reporter, guest) had access to a resource. Unfortunately we were
   creating every type of user for each test even though a test was only verifying one of
   them at a time. Now the tests only create the one user role they're testing.

See merge request !1023

Added Fork Project document to GitLab Basics



See merge request !1909

The user being created was no different than what `be_allowed_for` was
doing behind the scenes so we were essentially testing all user-level
accesses twice.