[ci skip]

[ci skip]

Remove unnecessary ee project select vue file

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

CE upstream - 2018-03-14 12:24 UTC

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

Fix import helper spec when a previous spec stubs settings

Closes gitlab-ee#5303

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

Remove jquery-rails from Gemfile

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

Resolve "Follow-up from "Store lfs on object storage by default""

Closes #5167

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

Add missing EE check for CI SAST view

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

Predefined variables collections / EE

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

Fix Scoped Boards bug filtering by No Milestone

Closes gitlab-ce#43317

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

Prevent hard-failing a mirror or sending an access request from failing when the project has invited masters/owners

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

Issues List: Add tooltip to weight icon

Closes #5170

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

Fix validation error message when historical data is empty

Closes #5268

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

Fix tiny typo

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

Fix typo! It should be dast instead of sast

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

Geo - Respect backoff time when repository have never been synced successfully

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

remove reference to sales@gitlab.com

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

Resolve "Geo event-log pruning worker is not enabled/disabled by the sidekiq cron manager"

Closes #5269

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

EE port of mr-widget-deployment-styling

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

# Conflicts:
#	app/assets/stylesheets/pages/merge_requests.scss
#	spec/models/ci/build_spec.rb

[ci skip]

Update foreman to 0.84.0

Closes #44160

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

Docs: Incoming e-mails: require gitlab-ctl restart

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

Fix styling of multiple environments in merge request widget

Closes #40610

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

* 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

Move CreateRepository to OPT_OUT for Gitaly

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

Improve pipeline / build variables specs / EE

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