# Conflicts:
#	db/schema.rb
#	doc/api/issues.md
#	doc/user/group/img/groups.png
#	doc/user/project/img/labels_list.png
#	locale/gitlab.pot

[ci skip]

Merge branch '50441-high-number-of-statement-timeouts-in-groupdestroyworker-due-to-sitestatistics' into 'master'

Resolve "High number of statement timeouts in GroupDestroyWorker due to SiteStatistics"

Closes #50441

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

Fix static analysis

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

Rails5: fix can't quote ActiveSupport::HashWithIndifferentAccess

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

Allow date parameters on Issues, Notes, and Discussions API for group owners

Closes #40059

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

Allow date parameters on Issues, Notes, and Discussions API for group owners

Closes gitlab-ce#40059

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

Allow disable packages feature per project

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

Display default status emoji if only message is entered

Closes #50067

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

Resolve "It's impossible to commit twice to the same branch"

Closes #50584

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

Expose user's id in /admin/users/ show page.

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

Creates vue component for environments block

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

Allow to delete group milestones

Closes #36138

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

[EE port]  Allow to delete group milestones

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

Geo: Replicate keep around refs

Closes #7245

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

Resolve "EE specific project_spec"

Closes #7361

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

Resolve "Size of checkout branch modal box is too small"

Closes #43625

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

Add Galician as an available language

Closes #43227

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

Resolve "[QA] `Test::Instance` doesn't use the correct path to spec files"

Closes #50746

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

Geo: Resolve sticky failures when attachments are missing on primary

Closes gitlab-com/migration#458

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

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

Compress all PNG images under doc/

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

Compress all PNG images under doc/

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

The pngquant tool was used https://pngquant.org, and particularly, the
following command:

        /usr/bin/pngquant -f --skip-if-larger --ext .png --speed 1 image.png

Before: 47584K
After : 34924K

The pngquant tool was used https://pngquant.org, and particularly, the
following command:

        /usr/bin/pngquant -f --skip-if-larger --ext .png --speed 1 image.png

Before: 47584K
After : 34924K

So consumers don’t need to know about `source`.

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

Merge branch '50526-flash-hideflash-sets-transition-style-test-fails-on-master-in-local-environment' into 'master'

Resolve ""Flash hideFlash sets transition style" test fails on master in local environment"

Closes #50526

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

CE upstream - 2018-08-27 09:23 UTC

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

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

Don't use ruby interpolation in externalized strings

Closes #50333

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

[EE-port] Reject ruby interpolation in externalized strings

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