* master: (85 commits)
  Export old code into es6 modules
  Use relative URL for projects to avoid storing domains
  Fix spec by avoiding monkeypatching
  Return the noteable in Note#touch_noteable
  add CHANGELOG.md entry for !15889
  fix broken empty state assets for environment monitoring page
  removed tab indexes from tag form
  Refactor entrypoint override docs
  Present member collection at the controller level
  Adds i18n
  check the import_status field before doing SQL operations to check the import url
  Fix rubocop offence
  Fix entrypoint overriding documentation
  Remove unnecessary js-issuable-edit
  Use memoization for commits on diffs
  Move Repository#write_ref to Git::Repository#write_ref
  Treat empty markdown and html strings as valid cached text, not missing cache that needs to be updated
  Center cluster title
  Remove noisy notification from QA base page
  Remove unused page from hashed storage QA scenario
  ...

* master: (112 commits)
  small change to make less conflict with EE version
  Add cop for use of remove_column
  Resolve merge conflicts with dev.gitlab.org/master after security release
  add index for doc/administration/operations/
  Remove RubySampler#sample_objects for performance as well
  Bugfix: User can't change the access level of an access requester
  Add spec for removing issues.assignee_id
  updated imports
  Keep track of storage check timings
  Remove a header level in the new 'Automatic CE->EE merge' doc
  Improve down step of removing issues.assignee_id column
  Fix specs after removing assignee_id field
  Remove issues.assignee_id column
  Resolve conflicts in app/models/user.rb
  Fix image view mode
  Do not raise when downstream pipeline is created
  Remove the need for destroy and add a comment in the spec
  Use build instead of create in importer spec
  Simplify normalizing of paths
  Remove allocation tracking code from InfluxDB sampler for performance
  ...

* master: (82 commits)
  Docs: add EEU tier to the landing page
  CE backport of ProtectedBranches API changes
  Support uploads for groups
  Update pipeline create chain Prometheus metric
  Don't set timeago title to what was already there.
  Resolve "Display member role per project"
  The API isn't using the appropriate services for managing forks
  Add chevron to create dropdown on repository page
  Rename GKE as Kubernetes Engine
  Fix specs for MySQL
  Fix broken tests
  Refactor banzai to support referencing from group context
  Fix specs after rebase
  Prevent dups when using StringIO for binary reads
  Bump redis-rails to 5.0.2 to get redis-store security updates
  add note on deploying Pages to a private network
  Bump GITLAB_SHELL_VERSION
  Updates the dropdown to match the docs and remove old hack of stop event propagation
  Move invalid builds counter out of the transaction
  Add invalid builds counter metric to stage seeds class
  ...

Add js prefix for issuable-edit (EE Version)

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

move .project-mirror-settings to ee namepsace

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

Remove the unused, EE-only mv_storage gitlab_projects command

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

Fix comment on image discussion icon alignment (update icons) -- EE merge edition

Closes gitlab-ce#39608

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

Optimize Geo specs by using deletion strategy for DB cleaner only when necessary

Closes #4259

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

Docs: move contributor analytics doc to correct location

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

Closes #4259

[EE] gitaly mirroring prep

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

Remove the Plan seed entirely and add factories to create them on-demand

Closes #4247

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

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39608

Use SVG icons to avoid having to position things
See https://gitlab.com/gitlab-org/gitlab-ce/issues/39608#note_50088917

CE upstream - Wednesday

Closes gitlab-ce#40543, gitaly#780, and gitaly#764

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

Containing epic

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

EE port of url-utility-es-module

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

EE- 35724 animate sidebar

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

Docs: add index for doc/administration/operations/

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

Standardise on self-signed certificates for PostgreSQL TLS

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

Resolve merge conflicts with dev.gitlab.org/master after security release (EE port)

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

Pick 10.2.4 security fixes into master (EE port)

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

Port of !12148 to EE

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

This also allows us to simplify the naming since we can make some
fetching methods private.

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