# 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

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

Replace project graphs spinach tests with RSpec analog

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

Replace project redirects spinach tests with RSpec analog

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

Hide emoji popup after multiple spaces or blank lines, closes #40620,#33678

Closes #40620 and #33678

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

Improve tests for predefined variables

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

 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

On .com repositories are created through Gitaly for a while now. For
customers this is not the case unless these have chosen to do so through
feature flags. By moving this to opt out, everyone will be using this.

This move is part of the migration issue
https://gitlab.com/gitlab-org/gitaly/issues/593

The bigger impact this commit will have is that tests that use a
repository through `FactoryBot.create(:project, :repository)` will now
use Gitaly to do so. As tests run on the same disk, or at least machine,
this will most probably slow them down.

removed pointless test & changed some deployment tests to make more sense
added in v-tooltip

Prior to this change, this method was called add_namespace, which broke
the CRUD convention and made it harder to grep for what I was looking
for. Given the change was a find and replace kind of fix, this was
changed without opening an issue and on another feature branch.

If more dynamic calls are made to add_namespace, these could've been
missed which might lead to incorrect bahaviour. However, going through
the commit log it seems thats not the case.

Geo: Fix Wiki resync when Wiki repository does not exist

Closes #5218

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

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036

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