Rémy Coutable bdfe6dc319 Merge branch 'fix-secret' into 'master' ...

Don't read otp_secret_encryption_key from hardcoded path in models/user

Variable `Gitlab::Application.config.secret_key_base` is set in config/initializers/secret_token.rb. It's very bad practice to use hard-coded paths inside an application and really unnecessary in this case.

Mirror of https://github.com/gitlabhq/gitlabhq/pull/10311

See merge request !4044

2016-05-09 14:17:33 +00:00

..

assets

Fix build notification on merge request page change even if the build status didn't change

2016-05-08 21:41:09 +02:00

controllers

Log to application.log when an admin starts and stops impersonating a user

2016-05-04 09:21:34 -07:00

finders

Prevent private snippets in public/internal projects from being leaked via API

2016-04-25 12:02:06 -07:00

helpers

Update SVG sanitizer to conform to SVG 1.1

2016-05-06 23:20:24 -07:00

mailers

Support e-mail notifications for comments on project snippets

2016-05-02 11:01:32 -07:00

models

Merge branch 'fix-secret' into 'master'

2016-05-09 14:17:33 +00:00

services

Merge branch 'escape-commit-titles' into 'master'

2016-05-08 23:53:49 +00:00

uploaders

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

Fix build notification on merge request page change even if the build status didn't change

2016-05-08 21:41:09 +02:00

workers

Merge branch 'create-wikis-during-check' into 'master'

2016-05-04 14:10:49 +00:00