summaryrefslogtreecommitdiff
path: root/config/settings.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42GitLab Bot2020-12-171-0/+8
|
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-07-201-3/+4
|
* Add latest changes from gitlab-org/gitlab@13-1-stable-eeGitLab Bot2020-06-181-0/+6
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-03-191-0/+6
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-03-181-6/+0
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-03-101-1/+2
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-191-0/+6
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-161-3/+3
|
* Update usage ping cron behaviorbjk/usage_pingBen Kochie2019-07-181-5/+9
| | | | | | | * Splay the start by sleeping up to one minute. * Adjust sideikiq retries to try up to approximately three hours. * Randomize the minute fully within the hour. * Psudo-randomize the day of the week based on the instance UUID.
* CE-EE parity for shared config filesRobert Speicher2019-07-091-0/+25
| | | | | This copies over EE-specific changes to shared configuration files in CE.
* Backport gitlab.yml.example from EEconfig-yaml-differencesYorick Peterse2019-06-201-0/+6
| | | | | | | | To make this happen, we need to conditionally add the group_saml strategy when running tests, but only on EE. This requires some changes to Gitlab.ee? so that it can be used before/without loading the Rails environment. We also have to change how we require a few files, so this can run outside of Rails.
* Ensure that db encryption keys have proper bytesizeGrzegorz Bizon2018-11-221-0/+8
|
* Fix attr_encryption key settingsStan Hu2018-06-021-8/+15
| | | | | | | | | | | | | attr_encrypted does different things with `key` depending on what mode you are using: 1. In `:per_attribute_iv_and_salt` mode, it generates a hash with the salt: https://github.com/attr-encrypted/encryptor/blob/c3a62c4a9e74686dd95e0548f9dc2a361fdc95d1/lib/encryptor.rb#L77. There is no need to truncate the key to 32 bytes here. 2. In `:per_attribute_iv` mode, it sets the key directly to the password, so truncation to 32 bytes is necessary. Closes #47166
* Add comment about the need for truncating keys in Ruby 2.4sh-add-ruby-2.4-commentStan Hu2018-06-011-0/+7
| | | | [ci skip]
* Upgrade to Ruby 2.4.4sh-bump-ruby-2.4Stan Hu2018-05-291-0/+4
| | | | | | | | | | | | Fixes that make this work: * A change in Ruby (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1) requires passing in the exact required length for OpenSSL keys and IVs. * Ensure the secrets.yml is generated before any prepended modules are loaded. This is done by renaming the `secret_token.rb` initializer to `01_secret_token.rb`, which is a bit ugly but involves the least impact on other files.
* Do not preload settingsKamil TrzciƄski2018-04-241-0/+126