# Conflicts:
#	db/schema.rb

Whitelist authorized_keys.lock in the gitlab:check rake task

Closes #38635

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

Improved file logging for authentication events

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

Fix gitlab-rake gitlab:import:repos task

Closes #37682

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

Fix case sensitive email confirmation on signup

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

Because of a change in GitLab 9.5.4 to prevent users from assuming control of
a repository already on disk, the import task broke. Imports would fail with
the message, "There is already a repository with that name on disk".

This change skips the validation when the import is done from the
command-line.

Closes #37682

Make GPG validation case insensitive

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

Log update-ref errors in OperationService

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

Make Redcarpet Markdown renderer thread-safe

Closes #36637

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

Attempt to link saml users to ldap by email

Closes #33493

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

Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"

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

Removes auto devops callout from repo editor view

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

The Redcarpet library is not thread-safe as described in
https://github.com/vmg/redcarpet/issues/570. Since we instantiate
the Redcarpet renderer in a class variable, multiple Sidekiq threads
can access the work buffer and corrupt the state. We work around
this issue by memoizing the renderer on a thread basis.

Closes #36637

This reverts commit 1d3c33b5.

Use Gitaly 0.43.0

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

Fix typo in comment deletion confirmation dialog

Closes #38619

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

Fix 'gitlay' typo in spec

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

Fix translation for 'a while' => 'in a while'

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

Ensure all refs are restored on a backup/restore

Closes #38352

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

Update CONTRIBUTING.md

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

Add changelog lint script to docs lint CI job

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

Implement OperationService.UserAddBranch Gitaly RPC

Closes gitaly#544

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

Remove global components

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

Ensure no exception is raised when Raven tries to get the current user in API context

Closes #38571

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

Resolve "Issue Sidebar : Don't render participants in collapsed state"

Closes #34366

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

Use `simple=true` for projects API in Projects dropdown for better search performance

Closes #38052

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

Merge branch 'master-i18n' into 'master'

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

Add GL_USERNAME environment variable for hooks

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