Merge branch '228675-separate-filtering-users-from-sorting-users-support-multiple-filters' into 'master'

Add support for mixing direct member filter with 2FA filter

See merge request gitlab-org/gitlab!48084

Move users#show.json to users#activity.json

See merge request gitlab-org/gitlab!48712

Seperate on-demand scan template from DAST template

See merge request gitlab-org/gitlab!48088

Remove unused issue header and issue blocked-by modal code

See merge request gitlab-org/gitlab!48762

Create devops adoption measurements

See merge request gitlab-org/gitlab!47388

- Expose the latest snapshot for segments
- Move all segment specific code to EE
- Use array for the groups association

Improve some of our GraphQL helper interfaces

See merge request gitlab-org/gitlab!48287

Added environment_url.txt example

See merge request gitlab-org/gitlab!48216

Make ProjectCacheWorker idempotent

See merge request gitlab-org/gitlab!48790

Replace how to merge HAML

See merge request gitlab-org/gitlab!48766

Replace how to merge HAML
modal with new Vue compenent
and delete old code.

Replace fa-chevron-down icons in clusters/gcp/form

See merge request gitlab-org/gitlab!48656

Update feature categories for 2020-12-01

See merge request gitlab-org/gitlab!48879

This moves our GraphQL helpers away from string-orientated operations to
the use of abstractions for arguments and field selections that are more
testable, composable and debugging friendly.

Fix kwargs deprecation warnings

See merge request gitlab-org/gitlab!48770

Remove resolve procs in type defs (Part 3) [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!48043

so that we can start using the new GraphQL
interpreter (https://graphql-ruby.org/queries/interpreter.html#compatibility)

# Conflicts:
#	ee/app/graphql/ee/types/issue_type.rb

# Conflicts:
#	app/graphql/types/ci/job_type.rb
#	app/graphql/types/merge_request_type.rb
#	ee/app/graphql/ee/types/project_type.rb

Add gon to Jira Connect App

See merge request gitlab-org/gitlab!48865

Fix depreciation warning for positional args for application context spec

See merge request gitlab-org/gitlab!48827

Fix depreciation warning for positional args

See merge request gitlab-org/gitlab!48808

Delete unused code as a result of migrating the issue header
from Haml to Vue and removing the vue_issue_header feature flag

Fix depreciation warning for positional args for project creator spec

See merge request gitlab-org/gitlab!48809

Add loading spinner to assignee header

See merge request gitlab-org/gitlab!48392

Update Gitaly version

See merge request gitlab-org/gitlab!48874

in clusters gcp form

Raise error if webpack errored during compilation

See merge request gitlab-org/gitlab!48802

Move jira_connect.js code to Vue App

See merge request gitlab-org/gitlab!48744

Block non-get and non-head requests

See merge request gitlab-org/gitlab!46045

in maintenance mode.

Quarantine failing E2E specs

See merge request gitlab-org/gitlab!48829

Contain flash message in projects commit show page

See merge request gitlab-org/gitlab!48439

Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/267751

users#show.json is unchanged.
Controller specs are added for users#activity.
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>

Consolidates JS for the Jira connect app,
reducing fetched JS from 2 files to 1.

Fix an unstable test around Issue Metrics Images API

See merge request gitlab-org/gitlab!48860