delta/gitlab/gitlab-ce.git/config, branch scroll-code-blocks gitlab.com: gitlab-org/gitlab-ce.git Instrument Project.visible_to_user 2016-08-12T14:43:10+00:00 Yorick Peterse yorickpeterse@gmail.com 2016-08-12T14:43:10+00:00 e0fc43ebe2d174c97062e79de36161914dafbb66 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. 
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 '15000-rename-markdown-preview' into 'master' 2016-08-11T16:06:56+00:00 Robert Speicher robert@gitlab.com 2016-08-11T16:06:56+00:00 5a33bc984abfb4ee6243c00bbcc71ccd086d2266 Rename `markdown_preview` routes to `preview_markdown` _Originally opened at !3700 by @cbartz._ Closes #15000. See merge request !5774 

Rename `markdown_preview` routes to `preview_markdown`

_Originally opened at !3700 by @cbartz._

Closes #15000.

See merge request !5774
 Merge branch 'remove-grack-lfs' into 'master' 2016-08-11T14:36:40+00:00 Rémy Coutable remy@rymai.me 2016-08-11T14:36:40+00:00 4c29c25497c9a20a5d1f57cd287123cd41edad96 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 

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
 Rename `markdown_preview` routes to `preview_markdown` 2016-08-11T13:54:18+00:00 Christopher Bartz bartz@dkrz.de 2016-04-13T12:17:42+00:00 ecb3f1eb6c87ab40108a5d71a3287a205ab6fefb 






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

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

Douwe Maan
douwe@gitlab.com

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

b1aac0382c406b3856db90e15df8b2a9ea7ff6cd


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





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






Merge branch 'brodock/gitlab-ce-feature/redis-sentinel'
2016-08-09T23:22:26+00:00

Douwe Maan
douwe@selenight.nl

2016-08-09T23:22:26+00:00

ee721e12ab00dd48a27bfe3f346498374473600b

# Conflicts:
#	lib/gitlab/redis.rb





# Conflicts:
#	lib/gitlab/redis.rb







Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into remove-grack-lfs
2016-08-09T10:27:37+00:00

Jacob Vosmaer
jacob@gitlab.com

2016-08-09T10:27:37+00:00

7a99826694ccc9dc5fd5f8cbecf7b51f8d690de4












Update to send changed password notification emails
2016-08-05T18:27:36+00:00

Tom Bell
tomb@tomb.io

2016-08-03T19:30:49+00:00

8720a6e4ef47675f5778b140b6b56615f808aff4

Add the devise initializer config setting to enable the sending of notification
emails when a user changes their password.





Add the devise initializer config setting to enable the sending of notification
emails when a user changes their password.







Added Redis Sentinel support documentation
2016-08-04T16:55:37+00:00

Gabriel Mazetto
gabriel@gitlab.com

2016-07-14T01:57:47+00:00

a5c1e2e55e6345192cf01dc422c07b894195a0d2












Synced mail_room.yml with the one in omnibus
2016-08-04T16:55:37+00:00

Gabriel Mazetto
gabriel@gitlab.com

2016-07-14T01:33:00+00:00

32bb42119527891bbc5cf3b86af8a75b8ac28ed6

Added a comment to remember developers to open merge request to omnibus
in future changes of the file.





Added a comment to remember developers to open merge request to omnibus
in future changes of the file.