* upstream/master: (130 commits)
Change auto-retry count to a correct value in docs
Fix background migration cleanup specs
Fix CI/CD job auto-retry specs
Fix JS; make buttons sr accessibile; fix overlay
remove redundant changelog entries
Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'
Merge branch '33303-404-for-unauthorized-project' into 'security-9-3'
Merge branch '33359-pers-snippet-files-location' into 'security-9-3'
Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3'
Hide description about protected branches to non-member
Update CHANGELOG.md for 9.0.11
Update CHANGELOG.md for 9.1.8
Update CHANGELOG.md for 8.17.7
Update CHANGELOG.md for 9.2.8
Update CHANGELOG.md for 9.3.8
Respect blockquote line breaks in markdown
35209 Add wip message to new navigation preference section
Add github imported projects count to usage data
Add versions to Prometheus metrics doc
Add Bulgarian translations of Pipeline Schedules
...
* upstream/master: (1168 commits)
Job details won't scroll horizontally to show long lines
Bring back branches badge to main project page
Limit OpenGraph image size to 64x64
Improve changelog
Split up MergeRequestsController
Add parent_id back to the tests
Make changelog more descriptive
Improve tests text
Rename members_count to members_count_with_descendants and expose only to group admins
Fix a bug where an invalid sort param value was passed to Gitaly
Drop default ORDER scope when calling a find method on a Sortable model
Add tests for project import state transition: [:started] => [:finished]
Add CHANGELOG
Perform housekeeping only when an import of a fresh project is completed
Strip trailing whitespace in relative submodule URL
Adjust projects spec on namespace fields
Add "members_count" and "parent_id" data on namespaces API
Removes redundant pending delete checks
Fix gitaly ref encoding bugs
Add ProjectWiki#ensure_repository
...
* master: (524 commits)
Improve user experience around slash commands in instant comments
Fix LFS timeouts when trying to save large files
retryable? is now available for CommitStatus
Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables"
Fix test failures
Add slugify project path to CI enviroment variables
Fixed typo: craeted -> created
32118 Make New environment empty state btn lowercase
Expose import_status in Projects API
32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon
Fix test failures
Allow manual bypass of auto_sign_in_with_provider
Fix keys seed
Allow users to be hard-deleted from the API
fixup some classnames and media queries
Enable the Style/PreferredHashMethods cop
Lint our factories creation in addition to their build
Don’t schedule workers from inside transactions
Allow scheduling from after_commit hooks
Forbid Sidekiq scheduling in transactions
...
Conflicts:
app/serializers/pipeline_entity.rb
db/schema.rb
spec/factories/ci/stages.rb
spec/lib/gitlab/import_export/safe_model_attributes.yml
spec/services/ci/create_pipeline_service_spec.rb
spec/spec_helper.rb
Grzegorz Bizon
Lin Jen-Shin
Robert Speicher
Shinya Maeda
Rémy Coutable
Kamil Trzciński
Ben Kochie
Z.J. van de Weg
Douwe Maan
Grzegorz Bizon
Felipe Artur
Valery Sizov