Fix JS equality rules in some specs

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

More conversions of $.ajax to axios

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

i18n flash message

Set alternate object directories in run_git

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

Resolve "Make tests running bundle install for gitaly more flexible"

Closes #42290

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

Digital Ocean Spaces now supports AWS v4 streaming API

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

See https://github.com/fog/fog-aws/issues/428#issuecomment-360869183

Generalize toggle_buttons for JavaScript usage

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

Fix spec failures in issues_spec.rb

Closes #42488

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

Include the GitLab version info when commercial content on help page is disabled

Closes #42486

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

Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110

Merge branch '42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error' into 'master'

Resolve "Import from GitLab.com fails (destination already exists and is not an empty directory error)."

Closes #42327

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

Moves components into vue files:

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

Merge branch '42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-ico' into 'master'

Port some non-EE-specific config/ changes to CE

Closes #42420

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

Backport QA changes from EE

Closes gitlab-ee#4698

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

gitlab-qa !155 - push creates event on activity page

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

Make sure that axios adapater is restored after mocking

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

* upstream/master:
  Just don't expand if it's already expanded
  fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec tests
  Fix rubocop offenses introduced in !16623
  Prefer local variables over given/let
  Try to restore page's state
  Add more views check
  Respect the latest changes from master
  Add a scenario for adding secret variables