* master:
  Add changelog entry
  Use `parsePikadayDate` to parse start and end dates
  Fix pipeline build specs in EE
  Remove legacy code from EE version of pipeline class
  Remove difference between CE and EE in build test
  Improve pipeline / build variables specs / EE

Conflicts:
	spec/models/ci/build_spec.rb
	spec/models/ci/pipeline_spec.rb

Improve pipeline / build variables specs / EE

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

 Conflicts:
   ee/app/models/ee/ci/pipeline.rb

Make Epic start and finish dates on Roadmap to be timezone neutral

Closes #5192

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

Geo: Fix Wiki resync when Wiki repository does not exist

Closes #5218

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

Document what to do to reset Geo tracking database

Closes #4910

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

CE upstream - 2018-03-14 03:53 UTC

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

Increase minimum mirror update interval from 15 to 30 minutes

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

CE upstream - 2018-03-13 21:25 UTC

Closes gitlab-ce#44024

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

Revert "Merge branch 'sh-filter-secret-variables' into 'master'"

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

This reverts merge request !17159

# Conflicts:
#	lib/gitlab/git/gitlab_projects.rb

[ci skip]

CE upstream - 2018-03-13 15:27 UTC

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

Upgrade GitLab Pages to v0.7.1

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

Resolve "gitlab:geo:check should check connections to the Geo tracking DB"

Closes #4849

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

Fix markdown table showing extra fake column v1

Closes #44024

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

fix timescale prometheus charts overlapping

Closes #43458

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

Specify installation type for link

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

Resolve "lib/gitlab/git/gitlab_projects.rb does not respect Gitlab.config.git.bin_path"

Closes #44161

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

Respect the configured git path for imported gitlab-shell operations (EE)

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

Add silent flag to curl in public IP lookup

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

Resolve "Geo: Don't attempt to expire the cache after a failed clone"

Closes #5197

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