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 |
---|---|---|
.. | ||
ci | Loading commit data... | |
concerns | Loading commit data... | |
hooks | Loading commit data... | |
members | Loading commit data... | |
network | Loading commit data... | |
project_services | Loading commit data... | |
protected_branch | Loading commit data... | |
.gitkeep | Loading commit data... | |
ability.rb | Loading commit data... | |
abuse_report.rb | Loading commit data... | |
appearance.rb | Loading commit data... | |
application_setting.rb | Loading commit data... | |
audit_event.rb | Loading commit data... | |
award_emoji.rb | Loading commit data... | |
blob.rb | Loading commit data... | |
broadcast_message.rb | Loading commit data... | |
commit.rb | Loading commit data... | |
commit_range.rb | Loading commit data... | |
commit_status.rb | Loading commit data... | |
compare.rb | Loading commit data... | |
deploy_key.rb | Loading commit data... | |
deploy_keys_project.rb | Loading commit data... | |
deployment.rb | Loading commit data... | |
diff_note.rb | Loading commit data... | |
discussion.rb | Loading commit data... | |
email.rb | Loading commit data... | |
environment.rb | Loading commit data... | |
event.rb | Loading commit data... | |
external_issue.rb | Loading commit data... | |
forked_project_link.rb | Loading commit data... | |
generic_commit_status.rb | Loading commit data... | |
global_label.rb | Loading commit data... | |
global_milestone.rb | Loading commit data... | |
group.rb | Loading commit data... | |
identity.rb | Loading commit data... | |
issue.rb | Loading commit data... | |
key.rb | Loading commit data... | |
label.rb | Loading commit data... | |
label_link.rb | Loading commit data... | |
legacy_diff_note.rb | Loading commit data... | |
lfs_object.rb | Loading commit data... | |
lfs_objects_project.rb | Loading commit data... | |
member.rb | Loading commit data... | |
merge_request.rb | Loading commit data... | |
merge_request_diff.rb | Loading commit data... | |
milestone.rb | Loading commit data... | |
namespace.rb | Loading commit data... | |
note.rb | Loading commit data... | |
notification_setting.rb | Loading commit data... | |
oauth_access_token.rb | Loading commit data... | |
personal_access_token.rb | Loading commit data... | |
personal_snippet.rb | Loading commit data... | |
project.rb | Loading commit data... | |
project_group_link.rb | Loading commit data... | |
project_import_data.rb | Loading commit data... | |
project_snippet.rb | Loading commit data... | |
project_team.rb | Loading commit data... | |
project_wiki.rb | Loading commit data... | |
protected_branch.rb | Loading commit data... | |
release.rb | Loading commit data... | |
repository.rb | Loading commit data... | |
security_event.rb | Loading commit data... | |
sent_notification.rb | Loading commit data... | |
service.rb | Loading commit data... | |
snippet.rb | Loading commit data... | |
spam_log.rb | Loading commit data... | |
spam_report.rb | Loading commit data... | |
subscription.rb | Loading commit data... | |
todo.rb | Loading commit data... | |
tree.rb | Loading commit data... | |
u2f_registration.rb | Loading commit data... | |
user.rb | Loading commit data... | |
users_star_project.rb | Loading commit data... | |
wiki_page.rb | Loading commit data... |