kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/models
History
Douwe Maan b1aac0382c Merge branch 'decouple-secret-keys' into 'master' 
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
2016-08-10 16:54:54 +00:00
..
ci Check for Ci::Build artifacts at database level 2016-07-29 14:08:41 +02:00
concerns Added concern for a faster "cache_key" method 2016-08-08 16:49:22 +02:00
hooks Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
members Fix Rename add_users_into_project and projects_ids 2016-08-04 08:55:50 -03:00
network Enable Style/SpaceAfterComma Rubocop cop 2016-06-29 15:23:44 +02:00
project_services Move color-logic into HipchatService#HipchatService 2016-07-27 11:29:05 +02:00
protected_branch Implement final review comments from @rymai. 2016-07-29 15:20:39 +05:30
.gitkeep
ability.rb Move abilities by subject class to a dedicated method 2016-08-04 16:00:31 +02:00
abuse_report.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
appearance.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
application_setting.rb Default to manual input for domain_whitelist, syntax fixes and added new tests. 2016-07-18 17:53:43 -05:00
audit_event.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
award_emoji.rb Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem. 2016-06-29 14:53:09 -06:00
blob.rb Ensure relative paths for video are rewritten as we do for images 2016-07-26 10:22:17 +02:00
broadcast_message.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
commit.rb Speed up Commit#repo_changes 2016-08-03 19:23:44 +02:00
commit_range.rb Fix comment for project argument in commit_range.rb 2016-06-20 11:12:04 -07:00
commit_status.rb Workaround MySQL with INNER JOIN: 2016-07-21 01:10:08 +08:00
compare.rb Make Compare#diffs diff_options a regular argument 2016-08-03 09:32:01 -07:00
deploy_key.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
deploy_keys_project.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
deployment.rb Improve manual actions code and add model, service and feature tests 2016-07-18 14:46:20 +02:00
diff_note.rb Speedup DiffNote#active? on discussions, preloading noteables and avoid touching git repository to return diff_refs when possible 2016-08-02 16:04:15 +02:00
discussion.rb Speedup DiffNote#active? on discussions, preloading noteables and avoid touching git repository to return diff_refs when possible 2016-08-02 16:04:15 +02:00
email.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
environment.rb Incorporate feedback 2016-07-29 13:54:45 +02:00
event.rb Use a more future-proof check for Note/LegacyDiffNote 2016-07-06 10:08:42 +02:00
external_issue.rb
forked_project_link.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
generic_commit_status.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
global_label.rb
global_milestone.rb
group.rb Dumb-down avatar presence check in avatar_url methods 2016-07-05 10:51:11 -04:00
identity.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
issue.rb Added concern for a faster "cache_key" method 2016-08-08 16:49:22 +02:00
key.rb Add simple identifier to public SSH keys 2016-08-02 06:56:23 +01:00
label.rb Simplify regex for string-based multi-word label surrounded in quotes 2016-07-13 16:01:27 -03:00
label_link.rb squashed - fixed label and milestone association problems, updated specs and refactored reader class a bit 2016-08-01 09:57:40 +02:00
legacy_diff_note.rb switch from diff_file_collection to diffs 2016-08-03 07:00:20 +02:00
lfs_object.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
lfs_objects_project.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
member.rb Incorporate review comments 2016-07-26 16:53:39 -07:00
merge_request.rb change the API on the merge_request_diff model from diffs -> raw_diffs 2016-08-03 23:32:12 +02:00
merge_request_diff.rb Enable Style/SpaceAroundEqualsInParameterDefault cop 2016-08-06 04:03:01 +02:00
milestone.rb use has_many relationship with events 2016-07-01 15:34:10 +02:00
namespace.rb Refactor repository paths handling to allow multiple git mount points 2016-06-29 22:30:31 -04:00
note.rb Added concern for a faster "cache_key" method 2016-08-08 16:49:22 +02:00
notification_setting.rb Exclude projects pending delete from notifications 2016-07-07 20:49:17 +01:00
oauth_access_token.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
personal_access_token.rb
personal_snippet.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
project.rb Clean up project destruction 2016-08-10 09:28:21 -07:00
project_group_link.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
project_import_data.rb add missing attribute to attr_encrypted so it is fully backwards-compatible 2016-06-28 09:55:19 +02:00
project_snippet.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
project_team.rb Fix Rename add_users_into_project and projects_ids 2016-08-04 08:55:50 -03:00
project_wiki.rb Refactor repository paths handling to allow multiple git mount points 2016-06-29 22:30:31 -04:00
protected_branch.rb Use Gitlab::Access to protected branch access levels. 2016-07-29 15:20:39 +05:30
release.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
repository.rb Update version_sorter and use new interface for faster tag sorting 2016-08-08 14:36:39 -04:00
security_event.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
sent_notification.rb Allow SentNotification#position to be set as string or hash 2016-07-11 12:21:05 -05:00
service.rb Make Service.external_wikis return only active external wikis 2016-07-21 10:36:02 +02:00
snippet.rb Merge branch 'feature/custom-highlighting' into 'master' 2016-06-28 08:42:42 +00:00
spam_log.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
spam_report.rb
subscription.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
todo.rb Add approval required todos 2016-07-12 19:01:09 +01:00
tree.rb
u2f_registration.rb Add a U2fRegistrations table/model. 2016-06-06 12:50:31 +05:30
user.rb Store OTP secret key in secrets.yml 2016-08-03 15:46:37 +01:00
users_star_project.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
wiki_page.rb WikiPage should have a slug even when not persisted. 2016-07-25 09:22:47 +05:30