# Conflicts:
#	app/controllers/dashboard_controller.rb
#	app/services/projects/update_pages_service.rb
#	doc/administration/index.md
#	doc/ci/variables/README.md
#	doc/ci/yaml/README.md
#	spec/models/environment_spec.rb

[ci skip]

Extend API for importing a project export with overwrite support

Closes #41900

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

Geo - Store checksum hashes as binary on the tracking database

Closes #5353

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

Add alternative archive route

Closes #38830

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

Merge branch 'blackst0ne-rails5-update-skip-before-action-in-authenticates-with-two-factor-concern' into 'master'

[Rails5] Add `raise: false` to skip_before_action in authenticates_with_two_factor.rb

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

Use gitaly 0.94.0

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

Improve docs about pipeline variables expressions

Closes #44786

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

Improve docs about pipeline variables expressions / EE

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

Fix environment deployment platform filter method / EE

Closes #5579

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

Fix environment deployment platform filter method

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

Remove support for legacy tar.gz pages artifacts

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

Remove support for legacy tar.gz pages artifacts

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

Implement a new SHA partial for commit lists

Closes #42448

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

Resolve "Show a message when loading the issues / merge requests dashboard without filters"

Closes #43246

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

Resolve "Show a message when loading the issues / merge requests dashboard without filters" (EE-port)

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

CE upstream - 2018-04-06 12:25 UTC

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

Copyedit plugins docs

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

Add a note to plugins.md about contributing back to GitLab

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

Repository archives are always named `<project>-<ref>-<sha>` even if
the ref is a commit. A consequence of always including the sha even
for tags is that packaging a release is more difficult because both
the ref and sha must be known by the packager.

- add `<project>/-/archive/<ref>/<filename>.<format>` route using the
`-` separator to prevent namespace collisions. If the filename is
`<project>-<ref>` or the ref is a sha, the sha will be omitted,
otherwise the default filename will be used.
- deprecate previous archive route `repository/<ref>/archive`

[ci skip]

[ci skip]

Update GitLab.com settings with current state

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

Rails 5.0 raises `ArgumentErrror` if an unrecognised callback is skipped.
https://github.com/rails/rails/commit/8b88df94ebda2e829782f514ff51caeaf5e694dd
This commit adds `raise: false` to the filter.

Cache personal projects count.

Closes #37462

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

Performance improvements warrants a changelog entry.

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

[Rails5] Update `type_cast_*_database`  methods

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

Closes #37462.