* ee/master: (28 commits)
  Add system hooks user_rename and group_rename
  Fix EE-only exception to the git default user SSH config check
  Allow Geo repository sync over HTTP/HTTPS
  Correctly handle a failure to create a new Geo node
  Refactor most EE-specific code out of Gitlab::Git::GitAccess
  More the specs more robust
  Make Geo::PruneEventLogWorker generate some logging
  Use Gitlab::Geo::LogHelpers where possible
  Improve mocking on Geo::NodeStatusService
  Do not generate Geo Log events when there are no secondaries
  Create Geo::PruneEventLogWorker
  Extract try_obtain_lease to a concern
  Update wording
  Spec the committer ChangeAccess check for merge requests
  Add a spec for a fast forward merge
  Validate that the committer email is verified on the user.
  Build messages used on the project settings page
  Rename commit_author to commit_committer
  Validate the commit using all known email addresses for the user
  Address some sections of first code review
  ...

Add ability to enforce that only the author of a commit can push those changes back to the repository

Closes #2445

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

Add system hooks user_rename and group_rename

Closes gitlab-ce#39596

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

Prune Geo event log

Closes #3577

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

Geo repository sync over HTTPS

Closes #3341

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

* ee/master: (22 commits)
  Add project actions in Audit events
  Update EE-specific API helpers spec
  Pull API job token behavior in line with other tokens, and expand test coverage
  Update documentation
  Add changelog items
  Update specs for sudo behavior
  Move RSS and incoming email tokens from User Settings > Accounts to User Settings > Access Tokens
  Remove user authentication_token column
  Migrate user private tokens to personal access tokens
  Add sudo API scope
  Consistently use PersonalAccessToken instead of PersonalToken
  Remove User#private_token
  Remove authentication using user.private_token
  Remove tokens:reset_all_auth rake task
  Remove gitlab:users:clear_all_authentication_tokens rake task
  Remove private_token from API user entity
  Remove Session API
  Remove Private Token from User Settings > Account
  Update CHANGELOG.md for 10.1.1
  Update CHANGELOG-EE.md for 10.1.1-ee
  ...

By actually checking if it deletes the correct Geo Event Log events.

The following is not supported:

```ruby
allow_any_instance_of(Geo::NodeStatusService).to receive(:call) { build(:geo_node_status, :healthy, cursor_last_event_id: 3) }
allow_any_instance_of(Geo::NodeStatusService).to receive(:call) { build(:geo_node_status, :healthy, cursor_last_event_id: 10) }
```

So instead, mock `Geo::NodeStatusService.new` and make it return a
`double` that can be used to mock all the things.

When there are no secondary nodes configured, there is no need to
generate Geo Log Events because no one will handle them.

This worker runs regularly to check all secondary nodes what there
last handled Geo Log event was. All the Geo Log events that are
handled by all nodes are pruned from the database. If the primary
failed to get the status of one of the nodes, nothing is done.

Closes gitlab-org/gitlab-ee#3577.

Add project actions in Audit events

Closes #1371

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

Remove Private Tokens

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

* ee/master:
  Fix for Linting Failure
  update changelog
  Fix rebase for forks
  Replaced Icon with Sprite Icon
  Applyed Patch for CI/CD Icons

Applyed Patch for CI/CD Icons

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

This is a CE-only change for now

This reverts commit 2f0f62e5.

Resolve "Failed to rebase MR from forked repo"

Closes #3900

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

* upstream/master: (74 commits)
  Resolve ""To do" should be "Todos" on Todos list page"
  Remove including ee module
  Remove Filesystem check metrics that use too much CPU to handle requests
  Set merge_request_diff_id on MR when creating
  Add a column linking an MR to its diff
  Remove useless closeReopenReport specs
  Clarify external artifacts only working when GitLab pages is enabled
  Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in
  Remove an exception from the git user default SSH config check
  Geo route whitelisting is too optimistic
  Update .nvmrc to current stable (v9.0.0)
  Update documentation
  Address Douwe's feedback
  Refactor responsive table styles to support nested error block
  Add changelog items
  Update specs for sudo behavior
  Move RSS and incoming email tokens from User Settings > Accounts to User Settings > Access Tokens
  Remove user authentication_token column
  Migrate user private tokens to personal access tokens
  Add sudo API scope
  ...

Suppress MergeableSelector warning candidates in EE-only files

Closes #3879

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

Resolve ""To do" should be "Todos" on Todos list page"

Closes #39417

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

IssueBoards: Show project name in group context inside board item and sidebar.

Closes #3239

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