diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
| commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
| tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /config/initializers/01_secret_token.rb | |
| parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'config/initializers/01_secret_token.rb')
| -rw-r--r-- | config/initializers/01_secret_token.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/config/initializers/01_secret_token.rb b/config/initializers/01_secret_token.rb index 8b96727a2a1..5949f463457 100644 --- a/config/initializers/01_secret_token.rb +++ b/config/initializers/01_secret_token.rb @@ -1,13 +1,5 @@ -# 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-foss/merge_requests/27581 -# * https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/3267 -# +# WARNING: Before you make a change to secrets.yml, read the development guide for GitLab secrets +# doc/development/application_secrets.md. # # 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). |