Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42 | GitLab Bot | 2023-03-20 | 1 | -0/+7 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42 | GitLab Bot | 2023-02-20 | 1 | -0/+11 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42 | GitLab Bot | 2022-12-20 | 1 | -5/+3 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@15-5-stable-ee | GitLab Bot | 2022-11-11 | 1 | -6/+0 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42 | GitLab Bot | 2022-09-19 | 1 | -0/+6 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42 | GitLab Bot | 2022-08-18 | 1 | -1/+5 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42 | GitLab Bot | 2022-06-20 | 1 | -1/+0 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42 | GitLab Bot | 2022-05-19 | 1 | -3/+3 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42 | GitLab Bot | 2021-08-19 | 1 | -6/+0 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42 | GitLab Bot | 2021-07-20 | 1 | -2/+2 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42 | GitLab Bot | 2021-05-19 | 1 | -6/+8 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42 | GitLab Bot | 2020-12-17 | 1 | -0/+8 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-2-stable-ee | GitLab Bot | 2020-07-20 | 1 | -3/+4 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-1-stable-ee | GitLab Bot | 2020-06-18 | 1 | -0/+6 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-19 | 1 | -0/+6 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-18 | 1 | -6/+0 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-10 | 1 | -1/+2 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-02-19 | 1 | -0/+6 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-10-16 | 1 | -3/+3 |
| | |||||
* | Update usage ping cron behaviorbjk/usage_ping | Ben Kochie | 2019-07-18 | 1 | -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 files | Robert Speicher | 2019-07-09 | 1 | -0/+25 |
| | | | | | This copies over EE-specific changes to shared configuration files in CE. | ||||
* | Backport gitlab.yml.example from EEconfig-yaml-differences | Yorick Peterse | 2019-06-20 | 1 | -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 bytesize | Grzegorz Bizon | 2018-11-22 | 1 | -0/+8 |
| | |||||
* | Fix attr_encryption key settings | Stan Hu | 2018-06-02 | 1 | -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-comment | Stan Hu | 2018-06-01 | 1 | -0/+7 |
| | | | | [ci skip] | ||||
* | Upgrade to Ruby 2.4.4sh-bump-ruby-2.4 | Stan Hu | 2018-05-29 | 1 | -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 settings | Kamil TrzciĆski | 2018-04-24 | 1 | -0/+126 |