# Conflicts:
#   app/assets/javascripts/merge_request_tabs.js

* 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
  ...

EE- new nav tech debt

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

Port of 28869-es6-modules to EE

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

Fix successful rebase throwing flash error message

Closes #4304

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

Update empty state for service desk

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

Restructure HA DB docs to provide better flow and checkpoints

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

Docs: update admin docs

Closes #4258

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

Port of '40285-prometheus-loading-screen-no-longer-seems-to-appear' to EE

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

Fix order-dependent spec failure by avoiding monkeypatching

Closes #4312

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

Merge branch 'ee-tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter' into 'master'

[EE] Refactor member view by using presenter

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

Explicit QA Runtime::Browse that handles sessions better / EE

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

Use new Geo nodes settings pages in Gitlab QA

Closes #4306

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

Clean up new dropdown styles (EE port)

Closes gitlab-ce#39142 and gitlab-ce#39446

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

move new epic dropdown to ee namespace

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

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

Fix an exception in Geo scheduler workers

Closes #4309

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

Resolve "Geo: cache results in issue and message count being incorrect"

Closes #4070

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

Docs: Explicitly mention which EE version contains different push rules

Closes #4196

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

Fix Geo specs failing due to "lock out" validation errors

Closes #4303

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

Replace license_admin_area.png to show new UI

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

Update license admin area images and instructions

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

Replace admin_wrench.png to match new UI

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

* master: (260 commits)
  Add js prefix for issuable-edit (EE Version)
  move .project-mirror-settings to ee namepsace
  Remove the use of plans table from deletion strategy
  Use deletion truncation strategy since it's faster on CI
  Optimize Geo specs by using truncation strategy for DB cleaner only when necessary
  Fix comment on image discussion icon alignment
  Remove the unused, EE-only mv_storage gitlab_projects command
  Containing epic
  move contributor analytics doc to correct location
  Docs: add index for doc/administration/operations/
  Resolve merge conflicts with dev.gitlab.org/master after security release (EE port)
  Update specs to create Plans on-demand
  Remove the Plan seed entirely and add factories to create them on-demand
  Unify mirror addition operations to prepare for Gitaly migration
  Add feature flag to use gitaly-ssh mirroring when cloning internal repos
  fixed import
  updated imports
  Resolve wrong conflict resolution in spec/features/projects/clusters_spec.rb
  Resolve conflicts in app/models/user.rb
  Manually add 10.2.4 changelog entries
  ...

* 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
  ...