# Conflicts:
#	CHANGELOG.md
#	app/views/layouts/nav/sidebar/_profile.html.haml
#	locale/gitlab.pot
#	spec/controllers/oauth/applications_controller_spec.rb

[ci skip]

CE upstream - 2018-09-21 00:21 UTC

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

Correct GitLab capitalization in CE code files (CE to EE Port)

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

Correct Gitlab Capitalization in code files

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

Merge branch '47398-user-is-unable-revoke-a-authorized-application-unless-user-oauth-applications-is-checked-in-admin-settings' into 'master'

Resolve "User is unable revoke a Authorized application unless User OAuth applications is checked in admin settings"

Closes #47398

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

Merge branch 'ee-47398-user-is-unable-revoke-a-authorized-application-unless-user-oauth-applications-is-checked-in-admin-settings' into 'master'

Always allow user to revoke an authorized application

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

[ci skip]

[ci skip]

[ci skip]

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

Docs: fix grammar (community contribution)

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

Fix activity titles for MRs in chat notification services

Closes gitlab-ee#5325

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

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

Fix long webhook URL overflow for custom integration

Closes #41040

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

Gitaly servers require the GitLab Shell secret

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

Fix broken link to modal component source

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

# Conflicts:
#	.gitlab-ci.yml
#	app/controllers/omniauth_callbacks_controller.rb

[ci skip]

EE Port of gitlab-ce!21736 (Enable frozen string in app/controllers/**/*.rb)

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

Enable frozen string in app/controllers/**/*.rb

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

CE upstream - 2018-09-20 15:21 UTC

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

Add Fog use_iam_profile option to docs

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

CI/review_apps: Make use of external-dns and ephemeral IPs

Closes #7683

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

Prune all the Geo event log tables correctly

Closes #6422

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

Add Gitlab::Database::Subquery.self_join to delete_all with limit

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

Don't rely on static IPs for Ingress/LoadBalancers. To do this, we
implement annotations for `external-dns` to be able to populate
endpoints into our `$REVIEW_APPS_DOMAIN`.

This requires the installation of `external-dns` into the cluster
used by CI, which is not a part of this MR.

See #7683 comments for details of installation.

Update wiki upload documentation

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