BigW Consortium Gitlab
Store OTP secret key in secrets.yml ## What does this MR do? Migrate the value of `.secret` to `config/secrets.yml` if present, so that `.secret` can be rotated without preventing all users with 2FA from logging in. (On a clean setup, generate different keys for each.) ## Are there points in the code the reviewer needs to double check? I'm not sure we actually need `.secret` at all after this, but it seems safer not to touch it. ## Why was this MR needed? We have some DB encryption keys in `config/secrets.yml`, and one in `.secret`. They should all be in the same place. ## What are the relevant issue numbers? #3963, which isn't closed until I make the relevant changes in Omnibus too. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5274
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
1_settings.rb | Loading commit data... | |
2_app.rb | Loading commit data... | |
4_ci_app.rb | Loading commit data... | |
5_backend.rb | Loading commit data... | |
6_validations.rb | Loading commit data... | |
active_record_query_trace.rb | Loading commit data... | |
attr_encrypted_no_db_connection.rb | Loading commit data... | |
backtrace_silencers.rb | Loading commit data... | |
bullet.rb | Loading commit data... | |
carrierwave.rb | Loading commit data... | |
chronic_duration.rb | Loading commit data... | |
connection_fix.rb | Loading commit data... | |
cookies_serializer.rb | Loading commit data... | |
date_time_formats.rb | Loading commit data... | |
default_url_options.rb | Loading commit data... | |
devise.rb | Loading commit data... | |
devise_password_length.rb.example | Loading commit data... | |
disable_email_interceptor.rb | Loading commit data... | |
doorkeeper.rb | Loading commit data... | |
gitlab_shell_secret_token.rb | Loading commit data... | |
go_get.rb | Loading commit data... | |
gollum.rb | Loading commit data... | |
hamlit.rb | Loading commit data... | |
health_check.rb | Loading commit data... | |
inflections.rb | Loading commit data... | |
kaminari_config.rb | Loading commit data... | |
metrics.rb | Loading commit data... | |
mime_types.rb | Loading commit data... | |
mysql_ignore_postgresql_options.rb | Loading commit data... | |
omniauth.rb | Loading commit data... | |
postgresql_limit_fix.rb | Loading commit data... | |
postgresql_opclasses_support.rb | Loading commit data... | |
premailer.rb | Loading commit data... | |
public_key.rb | Loading commit data... | |
rack_attack.rb.example | Loading commit data... | |
rack_attack_git_basic_auth.rb | Loading commit data... | |
rack_lineprof.rb | Loading commit data... | |
relative_naming_ci_namespace.rb | Loading commit data... | |
relative_url.rb.sample | Loading commit data... | |
request_profiler.rb | Loading commit data... | |
secret_token.rb | Loading commit data... | |
sentry.rb | Loading commit data... | |
session_store.rb | Loading commit data... | |
sherlock.rb | Loading commit data... | |
sidekiq.rb | Loading commit data... | |
smtp_settings.rb.sample | Loading commit data... | |
static_files.rb | Loading commit data... | |
time_zone.rb | Loading commit data... | |
trusted_proxies.rb | Loading commit data... | |
wrap_parameters.rb | Loading commit data... |