[ci skip]

CE upstream - 2018-07-17 08:47 UTC

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

Add Premium license checks for system messages

Closes #6160

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

Rails5 fix NoMethodError: undefined method 'message' for nil:NilClass

Closes #6605

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

[EE] Move Danger to test stage

Closes gitlab-ce#49185

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

Resolve "Change API docs to reflect that lookup by username does not require admin access"

Closes #38095

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

Update pipelines.md to have correct curl commands

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

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

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

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

CE upstream - 2018-07-16 15:23 UTC

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

Merge branch '6888-geo-project-imports-may-not-be-synced-if-repository-takes-some-time-to-fetch' into 'master'

Resync project repositories on secondaries nodes when import finishes

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

Project imports may not be synced if repository takes some time to
fetch. We also need to invalidate the checksum, otherwise we can
have stale checksums on the primary node.

Fix archived parameter for projects API

Closes #32301

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

Fix typo in CSS transform property for Memory Graph component

Closes #49291

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

Fix undefined constant Gitlab::Git::HooksService::PreReceiveError

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

Resolve "NoMethodError: undefined method `namespace' for nil:NilClass"

Closes #49061

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

# Conflicts:
#	locale/gitlab.pot

[ci skip]

Enable frozen string in apps/services/*.rb

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

Part of gitlab-org/gitlab-ce#49263

Update issue closing pattern

Closes #49166

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

CE upstream - 2018-07-16 12:22 UTC

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

Update Git version to 2.18.0

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

Fix invalid link to GitLab.com architecture.md

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

Add a 10 ms bucket for SQL timings

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

i18n: externalize strings from 'app/views/import'

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

Partially addresses #47424.

Move "search by email or username" block to "for normal users" section