7.12.2



See merge request !437

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

Conflicts:
	VERSION

Fixed the alignment of project settings icons

easy fix: changed %i to = icons

See merge request !432

For 7.12: Correctly show anonymous authorized applications under Profile > Applications.

See !924.

See merge request !925

Changes from CE 7-12-stable

See merge request !433

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

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

Conflicts:
	VERSION
	app/helpers/oauth_helper.rb

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>

Changes from 7-12-stable of CE

cc @jacobvosmaer

See merge request !429

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

Conflicts:
	VERSION

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

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

Conflicts:
	db/schema.rb
	doc/README.md
	doc/workflow/README.md

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