* master: (63 commits)
  Update CHANGELOG.md for 10.7.0
  Update CHANGELOG-EE.md for 10.7.0-ee
  Ignore ordering in IssueDueSchedulerWorker spec
  [Geo] Mentioned that custom hooks won't be replicated to secondary
  Return `false` instead of `nil`
  Do not attempt to fetch following a successful snapshot
  Use the Gitaly Snapshot RPCs in Geo synchronization
  Add an API endpoint to download git repository snapshots
  Fix issues without links when added from boards new issue  modal
  Resolve additional conflicts in spec/models/ci/build_spec.rb
  Remove a forgotten auto_include
  Shows new branch/mr button even when branch exists
  Resolve merge conflicts
  Resolved conflicts in Issue/Project models
  Update wikis_controller.rb
  Fix typo in vue.md
  Fix direct_upload when records with null file_store are used
  Upgrading gitlab-gollum-lib and rouge
  Update ProjectStatistics#build_artifacts_size synchronously without summing (#41059)
  Fix label links update on project transfer
  ...

Resolve "Geo doesn't replicate `custom_hooks`"

Closes #5583

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

CE upstream - 2018-04-19 13:23 UTC

Closes #4541

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

Add an API endpoint to download git repository snapshots (EE)

Closes #4767

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

Shows new branch/mr button even when branch exists

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

[ci skip]

[ci skip]

[EE-PORT] Fix issues without links when added from boards new issue  modal

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

Fix `NULL` insert attempts for `missing_on_primary`

Closes #5727

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

…if not a 404, or if no body is present, because the result will be saved as `missing_on_primary`, which does not allow NULL.

Resolve "Broken master due to goldiloader"

Closes #5725

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

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

EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17712

Improve tooltips on collapsible sidebars

Closes gitlab-ce#25010 et gitlab-ce#44272

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

Usage ping for projects_mirrored_with_pipelines_enabled

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

# Conflicts:
#	app/controllers/projects/wikis_controller.rb
#	app/models/ci/job_artifact.rb
#	app/models/issue.rb
#	app/models/project.rb
#	app/models/project_statistics.rb
#	spec/models/ci/build_spec.rb

[ci skip]

CE upstream - 2018-04-18 15:24 UTC

Closes gitaly#1115

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

Fix N+1 queries when loading participants for a commit note

Closes #45526

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

[Rails5] Fix `User#manageable_groups`

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

Fix typo in vue.md

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

Fixed IDE diff markers being cached too long

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

EE: Fix direct_upload when records with null file_store are used

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

Fix Epic timeline bar misalignment when start date is in last timeframe month and end date is out of range

Closes #5658

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

Added staged files state to IDE

Closes #44842, #44844, and gitlab-ee#4541

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

Fix direct_upload for old records

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