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

Add new predefined variable CI_COMMIT_SHORT_SHA

Closes #48061

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

Add ON DELETE constraint to namespace_id FK on gitlab_subscriptions

Closes gitlab-ce#55401

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

Add externalized strings for clusters error messages

Closes #45310

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

This is required to avoid an error when re-generating the FK due to
orphaned records. See more https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8871#note_125503270

Updates gitlab-svg dependency

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

Revert "Merge branch 'auto_devops_kubernetes_active' into 'master'"

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

Improve & clean up the PROCESS.md doc

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

Fix broken link in documentation

Closes #8890

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

Support both integer and string as epic count key

Closes #8824

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

Remove the project_cleanup feature flag

Closes #55230

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

Clarify messaging on what fails for too many failed lines

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

Fixed duplicated inline diff discussions

Closes #55388

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

Change `page_filter_path` to not exclude `label_name` by default

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

EE port of update-page-filter-path-defaults

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

Fix deprecation: Comparing equality between ActionController::Parameters and a Hash is deprecated

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

Remove deprecated ActionDispatch::ParamsParser

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

Merge branch '55433-un-revert-https-gitlab-com-gitlab-org-gitlab-ce-commit-00acef43-revert' into 'master'

Resolve "Un-revert https://gitlab.com/gitlab-org/gitlab-ce/commit/00acef434031b5dc0bf39576a9e83802c7806842 revert"

Closes #55433

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

Resolve "User profile page: Enhance horizonal whitespace between Overview columns"

Closes #55252

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

Epic state uses enum for saving state (other issuables use
string), because of this inconsistency we override `count_key`
which should return state as string converted to symbol
(.e.g. :closed). In rails 5 these integer states are automatically
converted to strings by Active Record.

But if subquery is used (to optimize searching), Active Record doesn't
convert state into string automatically (probably it can not deal with
the more complex query).

This means that epic state can be either integer (if subquery is used)
or string (if AR converted state to string automatically), so in
`count_key` we should convert state into string only if it's an integer.

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

Remove rails4 specific code

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

EE: Remove rails4 specific code

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

Document omnibus config for smartcard auth

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