# Conflicts:
#	locale/gitlab.pot

[ci skip]

Enable frozen string in apps/services/*.rb

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

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.

# Conflicts:
#	app/serializers/environment_entity.rb
#	locale/gitlab.pot
#	spec/javascripts/environments/mock_data.js

[ci skip]

Signed-off-by: Tao Wang <twang2218@gmail.com>

Update 10.6-to-10.7.md

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

Remove Repository#lookup and unreachable rugged code

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

Remove Repository#lookup and unreachable rugged code (EE version)

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

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

Closes charts/gitlab#586

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

Merge branch '48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage' into 'master'

Resolve "Project exports fail when uploads have been migrated to object storage"

Closes #48745

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

Make it more explicit what environment stop actions are

Closes #48672

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

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

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

Resolve "Arrow for linked pipeline has the wrong color"

Closes #6807

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

Add the CI Job trigger as the build trigger

Closes charts/gitlab#586

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

[EE Port] QA: Remove flaky and redundant expectations

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

QA: Remove flaky and redundant expectations

Closes #49164

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

Trigger rails5 tests if variable is set

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

Make it more explicit what environment stop actions are / EE

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

Allow Danger step to fail

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

Fix Danger checks for invalid Changelogs

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

Resolve "Auto DevOps help page - link has moved"

Closes #49262

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

Geo: Gracefully handle deleted events from Geo event log

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

Currently the Danger processing is producing false positives when master is
merged into a branch. Until #49175 is fixed, we should allow it to fail.