* 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

Remove including ee Epics module

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

Remove Filesystem check metrics that use too much CPU to handle requests

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

Resolve "Add a `merge_request_diff_id` column to `merge_requests`"

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

Refactor responsive table styles to support nested error block -- EE merge edition

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

Refactor responsive table styles to support nested error block

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

Incorporate Gitaly's OperationService.UserFFBranch RPC

Closes gitaly#693

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

Once we migrate existing MRs to have this column, we will be able to get the
latest diff for a single merge request more efficiently, and (more importantly)
get all latest diffs for a collection of MRs efficiently.

We already had this the other way around (merge_request_diffs.merge_request_id),
but this is needed to gather only the most recent diffs for a set of merge
requests.

Update .nvmrc to v9.0.0 (current stable)

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

Convert Icons in CI to SVG Sprite Icons

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

Show epic view

Closes #3550 and #3693

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

Pg ha updates docs

Closes omnibus-gitlab#2901, omnibus-gitlab#2899, omnibus-gitlab#2902, and omnibus-gitlab#2903

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

Document GitLab pages prerequisite with external HTML artifacts

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

[EE] Refactor controller calls into services

Closes #3544

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

Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in

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

CE upstream: Thursday

Closes gitaly#689 et gitlab-ce#39513

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

Remove Private Tokens

Closes #38595 and #38447

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

Remove an exception from the git user default SSH config check

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

Remove useless closeReopenReport specs

Closes gitlab-ee#3890

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