[ci skip]

# Conflicts:
#	.flayignore
#	CHANGELOG.md
#	app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue
#	app/controllers/projects/milestones_controller.rb
#	app/helpers/page_layout_helper.rb
#	app/models/ci/runner.rb
#	app/views/ci/variables/_variable_row.html.haml
#	app/views/import/github/new.html.haml
#	app/views/layouts/nav/sidebar/_project.html.haml
#	app/views/projects/new.html.haml
#	app/views/shared/_import_form.html.haml
#	doc/install/README.md
#	spec/features/groups/activity_spec.rb
#	spec/features/groups/issues_spec.rb
#	spec/features/groups/show_spec.rb
#	spec/javascripts/fixtures/projects.rb
#	spec/services/ci/retry_build_service_spec.rb

[ci skip]

Update README.md (settings -> pipelines is renamed to settings -> CI / CD )

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

Fix link to "Getting started with GitLab and DigitalOcean" page.

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

Update events.md with time period limit documentation

Closes #35912

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

EE port of vuex-action-helper-correctly-fail

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

[ci skip]

[ci skip]

[ci skip]

Fix background pipeline stages migration

Closes #44135

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

Port of add-per-runner-job-timeout to EE

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

Add per runner job timeout

Closes #43426

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

Add Gitlab::ExclusiveLease to ObjectStorage#use_file

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

ObjectStorage#use_file should respect exclusive lease

Closes gitlab-com/infrastructure#3874

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

CE upstream - 2018-03-28 12:06 UTC

Closes #5461

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

Fix promoting labels and milestones copy text

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

Fix promoting labels and milestones copy text

Closes #44208

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

Ensure hooks run when a deploy key without a user pushes

Closes #44317

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

Add canary favicon

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

Add canary favicon -- EE merge edition

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

Fix unapproved unassigned merge request e-mails failing -- CE backport

Closes gitlab-ee#3092

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

Gitlab-workhorse still needs RepoPath on Git HTTP

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

Replace group spinach tests with RSpec analog

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