Allow UrlValidator to work with attr_encrypted

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

Sync commonmaker version in Gemfile.*.lock

Closes #51557

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

commonmaker was update in Gemfile.lock only

Add fixture path argument to `MarkdownFeature.new`

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

Replace direct use of Gitlab::SQL::Union with a "from_union" method

Closes #51307

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

Add Gitaly diff stats RPC client

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

Extend JUnit XML test report documentation to explicitly mention support for filename patterns.

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

Decouple file row from IDE

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

Add 2fa button

Closes #47963

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

Update Contribution guidelines via new community contribution flow

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

This adds a basic interface to fetch diff statistics given two SHAs.
It's a requirement for #49399 #20282 and #19232.

Resolve "Add runner JSON schema"

Closes #51093

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

Backport EE changes (missing exports)

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

Backport EE changes to `app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js`

Include correct CSS file for xterm in environments page

Closes #50956

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

Fix double title in merge request chat messages

Closes #44586

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

This makes the file row component re-usable ouside of the Web IDE

Pre-request for https://gitlab.com/gitlab-org/gitlab-ce/issues/14249

When the xterm dependency was moved to a npm dependency
the CSS file path was not updated correctly in the environments page.

In order for xterm to render properly, it needs the correct CSS path.

Merge branch '50944-unable-to-import-repository-undefined-method-import_file-for-nil-nilclass' into 'master'

Resolve "Unable to import repository:  undefined method `import_file' for nil:NilClass"

Closes #50944

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

This commit adds the module `FromUnion`, which provides the class method
`from_union`. This simplifies the process of selecting data from the
result of a UNION, and reduces the likelihood of making mistakes. As a
result, instead of this:

    union = Gitlab::SQL::Union.new([foo, bar])

    Foo.from("(#{union.to_sql}) #{Foo.table_name}")

We can now write this instead:

    Foo.from_union([foo, bar])

This commit also includes some changes to make this new setup work
properly. For example, a bug in Rails 4
(https://github.com/rails/rails/issues/24193) would break the use of
`from("sub-query-here").includes(:relation)` in certain cases. There was
also a CI query which appeared to repeat a lot of conditions from an
outer query on an inner query, which isn't necessary.

Finally, we include a RuboCop cop to ensure developers use this new
module, instead of using Gitlab::SQL::Union directly.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51307

Fix grammar (setup to set-up) in code comments, spec, views, etc.

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

closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51093

Add retried jobs to pipeline stages

Closes #50461

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

Resolve "Send deployment information in job API"

Closes #50460

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

Support Kubernetes RBAC for GitLab Managed Apps for creating new clusters

Closes #29398

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

Fixed MR widget unresolved discussions state

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

Disable autocomplete for issuable due date field

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

Document how to enable/disable Auto DevOps at the instance level

Closes #49820

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

Update command-line-commands.md to include an sample taskflow

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

Improve docs about CI/CD config `extends`

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

This default will be overridden in the EE-specific subclass that uses a
different fixture path.

CE: Properly implement prepending for Concern

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