CE upstream - 2018-04-12 09:32 UTC

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

[EE] Make archived projects completely read-only

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

EE Port of "Clean up old project permissions frontend code"

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

Resolve "Missing border top in codeclimate report"

Closes #5637

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

Adds update guide for 10.7-ee

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

# Conflicts:
#	doc/topics/autodevops/index.md
#	lib/gitlab/utils.rb
#	spec/lib/gitlab/utils_spec.rb

[ci skip]

Merge branch 'backport-of-rd-3429-enabling-maximum-file-size-limit-in-repository-causes-pushes-to-fail' into 'master'

Backport of EE !4989

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

Merge branch 'rd-3429-enabling-maximum-file-size-limit-in-repository-causes-pushes-to-fail' into 'master'

Enabling maximum file size limit in repository causes pushes to fail

Closes #3429

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

CE upstream - 2018-04-12 08:01 UTC

Closes gitaly#1126

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

EE: Optimise rendering of Markdown documents that belong to different projects

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

Optimise rendering of Markdown documents that belong to different projects

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

Update github.md on GHE URL

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

[ci skip]

Update Auto-Devops docs to mention new REPLICAS env var

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

Ee 41436 use simpler env vars for auto devops replicas

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

CE upstream - 2018-04-11 15:29 UTC

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

Fix empty state for build that does not have a trace

Closes #45204

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

Resolve "RSpec Flaky pruner failure / Job Failed #62392094"

Closes #45245

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

Merge branch '5576-geo-checksum-failures-often-due-to-repository-not-existing-on-disk' into 'master'

Resolve "Geo: Checksum failures often due to repository not existing on disk"

Closes #5576

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

Instead of inspecting each commit delta, we rely on the usage of `git diff`
and `git cat-file` commands.

Signed-off-by: Rémy Coutable <remy@rymai.me>

Fix finding wiki file when Gitaly is enabled

Closes gitaly#1126

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

[CE Backport] Propagate broadcast messages to secondaries

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

Geo: Propagate broadcast messages to secondaries

Closes #4930

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