# Conflicts:
#	app/helpers/appearances_helper.rb

[ci skip]

Backport changes in EE MR 4972: System Header and Footer

See merge request gitlab-org/gitlab-ce!18001

Resolve "Add system header and footer"

Closes #5023

See merge request gitlab-org/gitlab-ee!4972

Add pagination docs to commit status API

See merge request gitlab-org/gitlab-ce!18124

Handle CR-LFs properly in .gitmodules file

Closes #2262

See merge request gitlab-org/gitlab-ce!18117

[CE] Backport SAML settings changes (Adds validators and rack cookie helper)

See merge request gitlab-org/gitlab-ce!18033

CE upstream - 2018-04-02 12:25 UTC

See merge request gitlab-org/gitlab-ee!5196

These changes are backported from EE, related to SAML settings in
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4549

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

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

Resolve "Migrate upload task fails for Groups"

Closes #44776

See merge request gitlab-org/gitlab-ce!18088

# Conflicts:
#	app/models/ci/build.rb
#	doc/ci/variables/README.md

[ci skip]

Bump html-pipeline to 2.7.1

Closes #24039

See merge request gitlab-org/gitlab-ce!18132

CE upstream - 2018-04-01 15:25 UTC

See merge request gitlab-org/gitlab-ee!5191

Update docs for API for issue and merge request description templates

See merge request gitlab-org/gitlab-ce!18114

Redesign application settings to match project settings (part 3)

See merge request gitlab-org/gitlab-ce!18056

Roadmap markup relayout

Closes #5068 and #4848

See merge request gitlab-org/gitlab-ee!5020

Pipeline variables expression in only/except configuration

Closes #37397

See merge request gitlab-org/gitlab-ce!17316

Resolve "Usage ping for Kubernetes integration"

Closes #44291

See merge request gitlab-org/gitlab-ce!17922

Implement pipeline variables expressions / EE version

See merge request gitlab-org/gitlab-ee!5127