Skip to content

EE application settings (not Docs) Cleanup

Marcel Amirault requested to merge (removed):ee-ce-application-settings into master

What does this MR do?

Note: Ports https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20723 to EE (Attempts to, anyways). Merge this (EE) first.

As part of https://gitlab.com/gitlab-org/gitlab-ce/issues/49155, this is a small cleanup so that the docs and settings sync better together. Mostly alphabetizing, but a few typo fixes too.

Fixed in settings.rb:

  • Typo in sidekiq_throttling_queus to sidekiq_throttling_queues
  • Typo in performance_bar_allowed_group_id description (Depreated -> Deprecated)

Alphabetized: settings.rb application_setting.rb application_settings_helper.rb ee/app/helpers/ee/application_settings_helper.rb and ee/app/models/ee/application_setting.rb

To Check:

  • encrypted_external_auth_client_key
  • encrypted_external_auth_client_key_iv
  • encrypted_external_auth_client_key_pass
  • encrypted_external_auth_client_key_pass_iv

Related to: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20721 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20723 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6600

Are there points in the code the reviewer needs to double check?

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Edited by Marcel Amirault

Merge request reports