Fix a test that is going to break, that has not broken yet

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

[skip ci]

# Conflicts:
#	app/helpers/application_settings_helper.rb
#	app/models/group.rb
#	db/schema.rb
#	spec/initializers/6_validations_spec.rb
#	spec/lib/gitlab/import_export/safe_model_attributes.yml

[ci skip]

CE upstream - 2018-03-23 06:25 UTC

Closes charts/helm.gitlab.io#291 and gitlab-ce#43937

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

Use geo.log for secondary repository verification logging

Closes #5178

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

Move GitLab.com settings under main docs

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

Move GitLab.com settings under main docs

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

Add Dependency Scanning feature and expose its artifacts in Merge Request

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

Use gitlab-shell 7.1.1

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

Fix EncodingHelper#clean blowing up on UTF-16BE strings

Closes gitaly#1101

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

Add Geo tracking DB rollback CI step

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

Rollback to a set version instead of an arbitrary number of steps

Closes #40302

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

Resolve "Autolinking includes trailing exclamation marks"

Closes #44587

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

Remove trailinng comma in webpack config

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

Add Vue resource interceptor to performance bar

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

HTTPS only Pages

Closes #28857

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

Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4

Closes #44554

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

Geo - Cleanup repository path implementation

Closes #5178

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

Update the menu information to access "Schedules" page

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

Update Prettier Print Width to 100

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

Updated Prettier Print Width to 100

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

Resolve "Limit number of failed logins using LDAP for authentication"

Closes #43525

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

Request Chinese Traditional proofreader permissions.

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

Show gitaly address instead of disk path

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

Fix issuable state indicator

Closes gitlab-ee#4683

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