# Conflicts:
#   db/schema.rb
#   package.json
#   spec/javascripts/test_bundle.js

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixed filter by label for issues CSV export

Closes #1926

See merge request !1444

Prevented Issues CSV export failing when author is nil

Closes #1936

See merge request !1454

Documentation updates for new Geo features

See merge request !1470

Rework ES permissions check

See merge request !507

[ci skip]

Port of 'make-karma-fast-again' to EE

See merge request !1455

CE Backport - Add closed_at field to issues

See merge request !1452

split Geo Omnibus/source info

Closes #1908 and #1917

See merge request !1431

Handle missing tracking DB configuration on a Geo secondary node

Closes #1911

See merge request !1436

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix weight sorting dropdown for issues

Closes #537

See merge request !1443

Remove repeated routes.path check for postgresql database

See merge request !10063

CE Upstream - Wednesday

Closes gitlab-ce#29425, gitlab-ce#29084, gitlab-ce#19742, and gitlab-qa#30

See merge request !1427

Fix Project Wiki update

Closes #29405

See merge request !9990

Do not add EE license if not set in GitLab QA tests

See merge request !1459

Use google-protobuf 3.2.0.2

See merge request !10014

Update 8.12-to-8.13.md: gitlab version 8.13 wants gitlab-shell v3.6.7

See merge request !10071

Todos performance: Include associations in Finder

See merge request !10076

Fix regressions introduced while adding CI endpoints in API v4

See merge request !9952

Allow dot in branch name in trigger/builds endpoint in API

Closes #29438

See merge request !10001

Allow creating merge request even if target branch is not specified in query params

Closes #28890

See merge request !9968

Allow unauthenticated access to some Branch API GET endpoints

Closes #29662

See merge request !10077