# Conflicts:
#	config/initializers/1_settings.rb
#	config/sidekiq_queues.yml

[ci skip]

Remove duplicated include IgnorableColumn in user model

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

Escape username and password in UrlSanitizer#full_url

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

Resolve "Clean up after RemoveCommaFromWeightSystemNotes migration"

Closes #6793

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

CE upstream - 2018-07-19 09:25 UTC

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

Use rugged to validate ref name

Closes #49043

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

Rails5 fix user sees revert modal spec

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

Delete UserActivities and related workers

Closes #43312

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

Delete UserActivities and related workers

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

Add button to regenerate 2FA codes.

Closes #48408

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

If a user uses a password with certain characters (e.g. /, #, +, etc.)
UrlSanitizer#full_url will generate an invalid URL that cannot be
parsed properly by Addressable::URI. If used with UrlBlocker, this
will be flagged as an invalid URI.

Improve email address parsing

Closes #44676

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

It's probably duplicated during resolving a conflict?

Incorporate Gitaly's RefService.FindAllRemoteBranches RPC

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

Incorporate Gitaly's RefService.FindAllRemoteBranches RPC

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

Rails5 fix undefined method 'namespace_project_settings_repository_path'

Closes #6931

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

Resolve "bad alignment in merge request widget (code climate, security report, etc.)"

Closes #6940

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

If you enter the following RFC 2822 compliant address:
`John Doe <john@doe.com>`

Gitlab will attempt to send three emails:
1) John
2) Doe
3) john@doe.com

With this change given the following:
`John Doe <johndoe@example.com>`
`Jane Doe <janedoe@example.com>`

Gitlab will send emails to `johndoe@example.com` and `janedoe@example.com`

CE upstream - 2018-07-18 22:42 UTC

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

Limit the TTL for anonymous sessions to 1 hour (EE port)

Closes gitlab-ce#48101

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

# Conflicts:
#	config/initializers/1_settings.rb

[ci skip]

Limit the TTL for anonymous sessions to 1 hour

Closes #48101

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

Resolve "Geo: Uninitialized constant Gitlab::Geo::ImportExportDownloader"

Closes #6929

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

By default, all sessions are given the same expiration time configured in the
session store (e.g. 1 week). However, unauthenticated users can generate a lot
of sessions, primarily for CSRF verification. It makes sense to reduce the TTL
for unauthenticated to something much lower than the default (e.g. 1 hour) to
limit Redis memory. In addition, Rails creates a new session after login,
so the short TTL doesn't even need to be extended.

Closes #48101

CE upstream - 2018-07-18 18:21 UTC

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

By default, all sessions are given the same expiration time configured in the
session store (e.g. 1 week). However, unauthenticated users can generate a lot
of sessions, primarily for CSRF verification. It makes sense to reduce the TTL
for unauthenticated to something much lower than the default (e.g. 1 hour) to
limit Redis memory. In addition, Rails creates a new session after login,
so the short TTL doesn't even need to be extended.

Closes #48101

Resolve "Tell people to rebase themselves when ee-specific-lines-check failed to rebase"

Closes #6915

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

[ci skip]

Add related issues loading icon top margin

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

# Conflicts:
#	locale/gitlab.pot

[ci skip]