The API permits path traversal characters like '../' to be passed down
to the template finder. Detect these requests and cause them to fail
with a 500 response code.

Prepare 11.6 RC3 release

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

Prepare 11.6 RC3 EE release

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

Merge branch '11-6-stable-prepare-rc3' of gitlab.com:gitlab-org/gitlab-ce into 11-6-stable-ee-prepare-rc3

This reverts commit e0be1f2b, reversing
changes made to 8e3d2001.

This reverts commit 872d486a, reversing
changes made to 756a5a8c.

This reverts commit e65e1842, reversing
changes made to 646ba241.

# Conflicts:
#	lib/gitlab/cache/ci/project_pipeline_status.rb

Ce to ee 2018 12 5 rc2

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

Prepare 11.6 RC2 EE release

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

Prepare 11.6 RC2 release

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

Fix EE load balancing crashing on Rails 5

Closes #8692

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

(cherry picked from commit 5159d9fc)

549e3f76 Fix EE load balancing crashing on Rails 5

Revert "Merge branch 'auto-devops-support-for-group-security-dashboard' into 'master'"

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

(cherry picked from commit a82833bc)

568cc2dd Revert "Merge branch 'auto-devops-support-for-group-security-dashboard' into 'master'"

Prepare 11.6 RC1 EE release

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

Prepare 11.6 RC1 release

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

Merge branch '11-6-stable-prepare-rc1' of gitlab.com:gitlab-org/gitlab-ce into 11-6-stable-ee-prepare-rc1

* '11-6-stable-prepare-rc1' of gitlab.com:gitlab-org/gitlab-ce:
  Resolve "Filter by `None`/`Any` for labels in issues/mrs/boards"
  Add test for "only mirror protected branches" setting
  Fix "protected branches only" checkbox not set properly at init
  Fix secondary nav dropdown menu styling in tablet and mobile screens
  Ensure unstar icon retains class when toggled
  Fixes race condition in delayed job spec
  Fixes tooltip overflowing in mini pipeline
  Fix deprecation: render :text is deprecated because it does not actually render a text/plain response
  Fix line height of numbers in file blame view.

The `only_protected_branches` value was being enabled by default
even though the checkbox was default off. In EE, this wasn't a
problem because there was EE-specific code to update the
entire form.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53515

Fix deprecation: render :text is deprecated because it does not actually render a text/plain response

Geo - Respect the next retry time when re-verifying failed repositories

Closes #8643

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

Fix line height of numbers in file blame view.

Closes #54048

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

Fix deprecation: Passing a class as a value in an Active Record query is deprecated

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

* '11-6-stable' of gitlab.com:gitlab-org/gitlab-ce:
  Resolve "Filter by `None`/`Any` for labels in issues/mrs/boards"
  Add test for "only mirror protected branches" setting
  Fix "protected branches only" checkbox not set properly at init
  Fix secondary nav dropdown menu styling in tablet and mobile screens
  Ensure unstar icon retains class when toggled
  Fixes race condition in delayed job spec
  Fixes tooltip overflowing in mini pipeline
  Fix deprecation: render :text is deprecated because it does not actually render a text/plain response

CE upstream - 2018-12-03 15:21 UTC

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

Scope the queries to retrieve failed repository verifications
by (repository|wiki)_retry_at < Time.now to respect the next
retry attempt, otherwise we retry them before the
(repository|wiki)_retry_at.

Fix "protected branches only" checkbox not set properly at init

Closes #53515

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

Fix deprecation: Passing a class as a value in an Active Record query is deprecated and will be removed.

Resolve "Filter by `None`/`Any` for labels in issues/mrs/boards"

Closes #52370

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

Fix deprecation: render :text is deprecated because it does not actually render…

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