Update doc/user/project/merge_requests/squash_and_merge.md

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

Fix typo in updateResolvableDiscussionsCounts action

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

Use separate Prometheus metrics dirs in dev/test

Closes #63869

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

Use PostgreSQL 9.6.11 in CI tests

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

Include username in auth log

Closes #62756

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

Fetches user based on the value of 'rack.attack.match_discriminator'

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62756

Custom username for deploy tokens

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

This new attribute is optional and used when set instead of the default
format `gitlab+deploy-token-#{id}`.

Empty usernames will be saved as null in the database.

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/50228.

Jekyll Pages template: LC_ALL=C.UTF-8

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

Start UnicornSampler in master process

Closes #63830

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

Using `on_master_start` assures that the sampler is started in
master process and not in worker processes.

Backports css class used in EE specs

Closes gitlab-ee#12534

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

Removes EE differences for app/views/groups/settings/_general.html.haml

Closes gitlab-ee#12537

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

Reconcile our team, group label definitions with our organization structure

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

Use title and description fields for issue trackers

Closes #63690

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

Cache Flipper persisted names directly to local memory storage

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

Prefer offline install for yarn

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

Store Sidekiq and Web server metrics from Prometheus in separate
directories in `development` and `test` environments.

Add @pslaughter to CODEOWNERS

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

Specify the minor version of postgresql for CI
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>

Step 2 of #62214: Includes logic to update namespaces storage statistics

Closes #62214

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

- Add two new ActiveRecord models:
  - RootNamespaceStoragestatistics will persist root namespace statistics
  - NamespaceAggregationSchedule will save information when a new update
to the namespace statistics needs to be scheduled
- Inject into UpdateProjectStatistics concern a new callback that will
call an async job to insert a new row onto NamespaceAggregationSchedule
table
- When a new row is inserted a new job is scheduled. This job will
update call an specific service to update the statistics and after that
it will delete thee aggregated scheduled row
- The RefresherServices makes heavy use of arel to build composable
queries to update Namespace::RootStorageStatistics attributes.
- Add an extra worker to traverse pending rows on
NAmespace::AggregationSchedule table and schedule a worker for each one
of this rows.
- Add an extra worker to traverse pending rows on
NAmespace::AggregationSchedule table and schedule a worker for each one
of this rows

Now that application settings are no longer dominating network traffic,
we see that the Feature#persisted_names is using a significant amount of
CPU and network bandwidth for Redis. Move this cache into the
thread-local memory storage to reduce Redis overhead.

Squash old migrations

Closes #59177

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

Merge branch '45104-special-characters-in-project-name-path-prevent-users-from-using-the-container-registry' into 'master'

Resolve "Special characters in project name/path prevent users from using the container registry"

Closes #62770 and #45104

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

Includes changes to the Vue container registry component to support
the display of an empty message and error message when invalid
characters are found in the group, project or branch name.

repositories/index.html.haml has been changed to remove the content
and place into Vue component.

- instead of using properties
- backward compatibility has to be kept for now

Feature/uninstall cluster ingress

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

- JupyterHub must not be available (installed or updated)

Disable juint reports tmp

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

Resolve "Cannot delete and upload file of the same name in the Web IDE"

Closes #60859

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

If an entry has been removed from the tree and later, during the same
session, a user is trying to add a new item with the same name/path we
should allow for that as long as the original entry is marked with
`deleted`.