Merge branch 'test-pg-mysql' into tmp

* test-pg-mysql:
  Properly use $BUNDLE_INSTALL_FLAGS
  Always use . and add more comments to prepare_build.sh
  Remove duplicated line
  Avoid Rails generating complicated query, see:
  Move variables back to where they are
  Just set GITLAB_DATABASE in the script
  Add # host for development and test as well
  We cannot use array in yaml variables
  Set profiler only for postgresql not mysql
  Use GITLAB_DATABASE: $CI_JOB_NAME[1] so that we
  Replace on host rather than socket, feedback:
  Only upload/download knapsack reports from pg
  Switch back to original repository
  Test all on EE, only master on CE, and -mysql branches
  Note that install knapsack later than bundle install
  Test both PostgreSQL and MySQL for the win.

Resolve "Disable the experimental GitLab elasticsearch indexer checkbox if it's not in $PATH"

Closes #2149

See merge request !1643

Add icon for approvals in MR

See merge request !1641

Port of use-avatars-in-activity-view to EE

See merge request !1632

Port of change-merged-icon to EE

See merge request !1640

Fix Service Desk emails

See merge request !1638

CE upstream to EE master (Tue)

Closes #1369 and gitaly#173

See merge request !1628

We now explicitly set an `@unsubscribe_url`.

Setup and run a Gitaly server for testing if GitalyClient is enabled

See merge request !1601

Add ce-to-ee guide for 9.1

See merge request !1631

Separate EE params from CE on Grape API

See merge request !1585

Fix edit button on blame page without repo perms -- EE merge edition

Closes gitlab-ce#30636

See merge request !1621

EE port of dm-outdated-diff-link

See merge request !1625

Without repo permissions, pressing the "Edit" button on the blame page
will now prompt to Fork/Cancel.

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

Conflicts:
	app/views/projects/blob/_header.html.haml

EE port of dm-remove-copy-link-on-blame-page and dm-remove-copy-link-on-svgs

See merge request !1624

Cache Gitlab::Geo queries

Closes #1983

See merge request !1507

Issue board focus mode docs

See merge request !1618

# Conflicts:
#   app/views/projects/blob/_header.html.haml

CE upstream - Friday

Closes gitlab-ce#30496, gitlab-ce#27262, and gitlab-ce#29193

See merge request !1605