diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-05-10 21:24:47 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-05-10 21:24:47 +0000 |
| commit | 03be735c38406d7ac042d40a08f03e683e65553b (patch) | |
| tree | 8c2b88770088a719fc175ea3d55740359a26b988 | |
| parent | 3ec966ade28393ee8f72e9537205c00ff932be69 (diff) | |
| parent | 33aa185d83e3fc8ed4e2e2fbb8aad97e3a6d8011 (diff) | |
| download | gitlab-ce-03be735c38406d7ac042d40a08f03e683e65553b.tar.gz | |
Merge branch 'sh-add-omnibus-secrets' into 'master'
Add warning about updating Omnibus is secrets are updated
See merge request gitlab-org/gitlab-ce!28247
| -rw-r--r-- | config/initializers/01_secret_token.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config/initializers/01_secret_token.rb b/config/initializers/01_secret_token.rb index 4328ca509ba..e24b5cbd510 100644 --- a/config/initializers/01_secret_token.rb +++ b/config/initializers/01_secret_token.rb @@ -1,3 +1,14 @@ +# WARNING: If you add a new secret to this file, make sure you also +# update Omnibus GitLab or updates will fail. Omnibus is responsible for +# writing the `secrets.yml` file. If Omnibus doesn't know about a +# secret, Rails will attempt to write to the file, but this will fail +# because Rails doesn't have write access. +# +# As an example: +# * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27581 +# * https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/3267 +# +# # This file needs to be loaded BEFORE any initializers that attempt to # prepend modules that require access to secrets (e.g. EE's 0_as_concern.rb). # |