* upstream/master: (166 commits)
  Flowdock uses Gitaly, not Grit
  Removes 'no job log' from trace action
  Fix missing namespace for some internal users
  Dedupe yarn dependencies
  Downgrade MySQL CI service from 8.0 to 5.7
  Atomic internal ids for all models
  Add documentation on how to configure Redis Sentinel by persistent class
  Update CHANGELOG.md for 10.7.0
  Update index.md
  Resolve "Text from the diff is showing within a table header inside the discussion after the discussion is resolved"
  Don't include lfs_file_locks data in export bundle
  Documentation: Frontend Building Checklist
  Fix a documentation typo for GitLab pages
  Refactored activity calendar
  Add an API endpoint to download git repository snapshots
  Fix issues without links when added from boards new issue  modal
  Respect visibility options and description when importing project from template
  Resolve "Improve tooltips of collapsed sidebars"
  Update Container Scanning documentation
  Fix typo in vue.md
  ...