# Conflicts:
#	CHANGELOG.md
#	Gemfile.lock
#	app/assets/javascripts/boards/components/board_card.vue
#	app/assets/javascripts/boards/models/issue.js
#	app/assets/javascripts/init_legacy_filters.js
#	app/models/system_note_metadata.rb
#	db/schema.rb

[ci skip]

Replace vue-resource for axios in the Prometheus Dashboard

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

CE Upstream - Monday

Closes #4056 and gitlab-qa#113

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

Disables autocomplete in filtered search

Closes #38877

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

Fix reply quote keyboard shortcut on MRs

Closes #40295

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

Backport QA code that belongs to CE from EE Geo

Closes #40344

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

Improve output for extra queries in specs

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

Change example for push rules to match comments.

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

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

In the PG HA docs tell the user they can skip ahead if they need to

Closes gitlab-org/build/team-tasks#63

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

Switch to using gettext:compile instead of gettext:pack in the install docs

Closes #40360

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

At the end of the `Ensure GitLab is running` step, the user should have
a working setup and may be done with the guided tour.  It may be the
user has a problem, so instead needs to jump ahead to troubleshooting,
but the current structure is:

* Required information
* Initial node configuration
  * Consul
  * Database
  * Pgbouncer
  * Application
* Node post configuration
  * Consul
  * Database
  * Pgbouncer
  * Application
* Failover
* Restore
* Alternative configuration
* Troubleshooting

Here we just add a link to the end of 'Node post configuration / Application', rather than restructure.

Previously, this used `Array#-`, which would remove all queries that matches the
query text in the original set.

However, sometimes we have a problem with parameterised queries, where the query
text is identical both times, so we'd run a query N times instead of once, and
it would be hidden from the output.

Replace the logic to only remove a given query N times from the actual log,
where N is the number of times it appears in the expected log.

[EE] Try to find the merge-base against the canonical master and name the remotes

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

Try to find the merge-base against the canonical master and name the remotes

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

Fix spec to ensure BaseSyncService doesn't leave deleted directory around

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

Fixed new group milestone breadcrumb

Closes #40338

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

Closes #40338

Merge alpha_database into database

Closes gitlab-org/build/team-tasks#62

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

As these instructions are now GA for 10.2, we move the contents of
alpha_database.md into database.md, as a new section `Configure using
Omnibus for High Availability`.  The old section heading is kept to
redirect the user to either the new guide, or the old version of the docs.

We move the architecture discussion up, to supplement the overview of
the install.

Add Group Milestone sorting

Closes #39720

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

Also, name the remotes in Gitlab::EeCompatCheck
Signed-off-by: Rémy Coutable <remy@rymai.me>

Also, name the remotes in Gitlab::EeCompatCheck
Signed-off-by: Rémy Coutable <remy@rymai.me>

Add QUERY_RECORDER_DEBUG environment variable to improve performance debugging

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

Add support of Mermaid

Closes #3711

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

Add FetchSourceBranch Gitaly call

Closes gitaly#758

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

Merge branch 'qa/gb/add-geo-integration-tests' into 'master'

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

Don't user issuable_sort cookie for epics collection

Closes #4114

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

Document a failure mode for large repositories in Geo

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

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

[ci skip]

[ci skip]