gitlab-org--gitlab-foss/spec
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
..
config Small refactor and a few documentation fixes 2016-08-04 19:02:39 +02:00
controllers adds second batch of tests changed to active tense 2016-08-09 15:11:39 +01:00
factories TST: Use more accurate time windows so tests do not fail 2016-08-04 14:50:39 -04:00
features Merge branch 'adambuckland/gitlab-ce-19727-sort-submodules-with-files' 2016-08-09 18:45:25 -05:00
finders fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
fixtures Small refactor in Redis class and improved specs 2016-08-06 04:15:16 +02:00
helpers adds second batch of tests changed to active tense 2016-08-09 15:11:39 +01:00
initializers Give priority to environment variables 2016-08-03 15:48:48 +01:00
javascripts Merge branch 'date-time-to-day-tests' into 'master' 2016-08-05 19:38:05 +00:00
lib Merge branch 'feature/svg-badge-template' into 'master' 2016-08-10 16:52:56 +00:00
mailers adds second batch of tests changed to active tense 2016-08-09 15:11:39 +01:00
models Clean up project destruction 2016-08-10 09:28:21 -07:00
requests Fix Grape tests. 2016-08-09 09:43:57 -06:00
routing Add failing test for #20462 2016-08-02 03:32:28 +02:00
services Clean up project destruction 2016-08-10 09:28:21 -07:00
support Enable Style/SpaceAroundEqualsInParameterDefault cop 2016-08-06 04:03:01 +02:00
tasks/gitlab adds second batch of tests changed to active tense 2016-08-09 15:11:39 +01:00
uploaders Remove VideoJS and clean the integration 2016-07-20 11:36:42 +02:00
views Remove provider path, replace with dynamic path. 2016-08-03 11:50:38 -06:00
workers adds second batch of tests changed to active tense 2016-08-09 15:11:39 +01:00
factories_spec.rb adds second batch of tests changed to active tense 2016-08-09 15:11:39 +01:00
rails_helper.rb
simplecov_env.rb Introduce SimpleCovEnv singleton helper and use it 2016-07-21 12:46:49 +02:00
spec_helper.rb Add a method in Project to return a cached value of total count of projects 2016-08-09 16:08:03 -07:00
teaspoon_env.rb Add test coverage analysis for CoffeeScript (!5052) 2016-08-07 21:52:37 +02:00