Replace the `project/issues/weight.feature` spinach test with an rspec analog

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

Resolve "Downstream pipeline arrow is not the same height or color as the other connectors"

Closes #3572

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

Refactor the browser performance testing docs

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

CE upstream - 2018-04-02 14:31 UTC

Closes #2262 and gitlab-ce#2262

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

Fix extra by on the mr_widget approvals body

Closes #4988

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

Add button type to settings toggle

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

Add setup instructions for setting up NFS in a typical GitLab HA cluster.

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

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

On needs quotes in Laravel ci Example

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

Provide clarification on mirrored repositories for pipelines

Closes gitlab-ce#39929

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

Refactor the LFS S3 docs

Closes #3517

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

Prettify mock data files - EE port

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

# 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