Merge branch 'SAML_1888' into 'master'

Add SAML to list of social_provider

See merge request !894

Add SAML to list of social_provider

Resolves issue 1888.  Still an issue because the SAML link under Connected Accounts will not have a logo.

See merge request !891

Fix error when deleting a user who has projects

See merge request !875

Closes #1856
Closes https://github.com/gitlabhq/gitlabhq/issues/9394

!794 for 7-12-stable

Brings !794 to 7-12-stable.

cc @jacobvosmaer

See merge request !826

Revert merge request states renaming

Replaced:

* "Accepted" with "Merged"
* "Rejected" with "Closed"

This is cherry-pick of !844 but for 7-12-stable. For 7.12.1

See merge request !863

Fix post-receive errors on a push when an external issue tracker is configured

Closes #1700
Closes #1720

See merge request !855

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

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

Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Convert CRLF newlines to LF when committing using the web editor.

Fixes #1823 and https://github.com/gitlabhq/gitlabhq/issues/7950.

Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/29 being merged and a new gitlab_git being released.

cc @jacobvosmaer

See merge request !858

Disable changing of target branch in new merge request page when a branch has already been specified

Closes #1830

See merge request !856

Fix Error 500 when one user attempts to access a personal, internal snippet

Closes #1815

See merge request !857

Disable changing of target branch in new merge request page when a branch has already been specified

Closes #1830

Closes #1815

Closes #1700
Closes #1720

Fix 403 Access Denied error messages when accessing Labels section in a project

This occurs when MRs are enabled but issues are enabled

Closes #1813

See merge request !842

Fix 403 Access Denied error messages when accessing Labels section in a project that has MRs disabled but issues enabled

Closes #1813

"Fix behavior of ldap_person method in Gitlab::OAuth::User" for 7.12

See !837

See merge request !840

Fix behavior of ldap_person method in Gitlab::OAuth::User

Code tweaks in 45e9150a caused the ldap_person method to not return expected results.
Improved tests to cover the ldap_person method, which was previously stubbed.

Restored the previous implementation of ldap_person, as I could not find a more concise to write it that still works with all the test cases.

See merge request !837

Backport custom dashboard

This is a backport of !778 without the `Gitlab::Themes` refactor for the 7.12 branch.

See merge request !828

Bump rails to 4.1.11, jquery-rails to 3.1.3 for stable

See merge request !832

Bump rails to 4.1.11, jquery-rails to 3.1.3

rails 4.1.11 notes - http://weblog.rubyonrails.org/2015/6/16/Rails-3-2-22-4-1-11-and-4-2-2-have-been-released-and-more/

jquery-rails < 3.1.3 security advisory: https://groups.google.com/forum/#!topic/ruby-security-ann/XIZPbobuwaY

See merge request !830

cherry-picked

cherry-picked

cherry-picked

cherry-picked

cherry-picked

cherry-picked

cherry-picked

Also converts doc/README.md to Unix line endings

cherry-picked

cherry-picked

cherry-picked

cherry-picked