delta/gitlab/gitlab-ce.git/config/initializers, branch cache_diff_file_diffs_content

Fix cron job key

2016-08-19T15:09:38+00:00

Merge branch 'master' into expiration-date-on-memberships

2016-08-19T00:04:31+00:00

Small refactor and syntax fixes.

2016-08-18T21:47:26+00:00

Removed unnecessary service for user retrieval and improved API error message.

2016-08-18T21:47:26+00:00

Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner Password Credentials flow.

2016-08-18T21:47:26+00:00

Allow project group links to be expired

2016-08-18T21:45:41+00:00

Merge branch 'master' into expiration-date-on-memberships

2016-08-18T14:54:07+00:00

Instrument Project.visible_to_user

2016-08-12T14:43:10+00:00

Because this method is a Rails scope we have to instrument it manually
as regular the instrumentation methods only instrument methods defined
directly on a Class or Module.

Merge branch 'remove-grack-lfs' into 'master'

2016-08-11T14:36:40+00:00


Remove Grack::Auth: part 2 (LFS)

Deprecate Grack::Auth and handle LFS in Rails controllers under the Project namespace.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14501

See merge request !5369

Merge branch 'decouple-secret-keys' into 'master'

2016-08-10T16:54:54+00:00


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