# 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

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]

CE upstream - 2018-07-18 13:39 UTC

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

Proper icon validator

Closes #49236

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

Toggle Show / Hide Button for Kubernetes Password

Closes #49193

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

Remove extra slash in path

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

EE-Port: Proper icon validator (gitlab-ce!20620)

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

Resolve "Fix arrow for popovers on monitoring graph"

Closes #41784

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

Fix rendering context lines on MR diffs

Closes #49242 and #49343

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

ee-specific-lines-check, Show diff because git status might not be readable

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

Closes #49193.

Resolve "Add support for tar.gz AUTO_DEVOPS_CHART charts"

Closes #49324

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

Fix autosave issues for MR discussions

Closes #48876 and #48877

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

Fix autosave issues for MR discussions.

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

Merge branch '49369-failure-in-qa-specs-features-ee-geo-attachment_replication_spec-rb' into 'master'

Resolve "Failure in qa/specs/features/ee/geo/attachment_replication_spec.rb"

Closes #49369

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

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

Point to charts docs for beta limitations of the gitlab chart.

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

Fix serialization of LegacyDiffNote

Closes #49355

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

Remove background color from card-body style

Closes #49350

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

Fix filename for accelerated uploads

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

Fix billing card title colors

Closes #6326

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

# Conflicts:
#	app/assets/javascripts/vue_shared/components/reports/issues_list.vue
#	app/assets/javascripts/vue_shared/components/reports/report_issues.vue
#	locale/gitlab.pot
#	spec/javascripts/vue_shared/components/reports/report_section_spec.js

[ci skip]