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

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]

Docs: fix grammar (community contribution)

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

# 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

For next files:

- app/controllers/admin/application_settings_controller.rb
- config/routes/admin.rb
- locale/gitlab.pot
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Add webhook branch filtering docs

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

QA: Fix failure in merge_merge_request_from_fork_spec.rb

Closes #51657

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

Move the cloud-native-image trigger job into the test stage

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

Fixes Admin Runners table not wrapping the content

Closes #51549

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

# Conflicts:
#	app/controllers/admin/application_settings_controller.rb
#	config/routes/admin.rb
#	locale/gitlab.pot
#	spec/features/admin/admin_settings_spec.rb

[ci skip]

`delete_all` doesn't support limit, so you'd need to subquery
that. And instead of subquerying with `where(id: query)`, it's better
to use an `INNER JOIN`. This method also works with MySQL, while
subquerying doesn't (without another layer of subquerying)

Reference:
https://stackoverflow.com/questions/17892762/mysql-this-version-of-mysql-doesnt-yet-support-limit-in-all-any-some-subqu/17892886#17892886

Resolve "Split admin settings into multiple sub pages"

Closes #44998

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

EE Port: Split admin settings into subpages

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

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

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

Fixed hidden truncated diff lines not showing when expanded

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

Even if User OAuth applications setting is disabled in admin settings.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>