Douwe Maan 34e8c56236 Merge branch 'fix/token-timing-attack' into 'master' ...

fix token issue - timing attack

Updates token comparisons to use a secure version instead of `==`

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13617

See merge request !3062

2016-03-12 12:14:32 +00:00

..

assets

Merge branch 'fix_responsive_layout_bug' into 'master'

2016-03-11 22:58:14 +00:00

controllers

Merge branch 'group-activity-separate-tab' into 'master'

2016-03-11 19:58:10 +00:00

finders

Clean up ProjectsFinder for getting user projects

2016-03-11 15:25:23 -05:00

helpers

Merge branch 'nico-de-ceulaer/gitlab-ce-13865-handle-other-emails-for-avatar-lookup'

2016-03-12 13:12:40 +01:00

mailers

Fix broken link in CI build notification emails

2016-02-12 14:01:27 +01:00

models

Merge branch 'fix/token-timing-attack' into 'master'

2016-03-12 12:14:32 +00:00

services

Refactor Gitlab::ProjectSearchResults

2016-03-11 15:25:22 -05:00

uploaders

Minor changes on avatar cropping internals

2016-02-18 13:12:39 +01:00

validators

Allow webhooks URL to have leading and trailing spaces

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

views

Merge branch 'group-activity-separate-tab' into 'master'

2016-03-11 19:58:10 +00:00

workers

Use Gitlab::Git::DiffCollections

2016-03-03 18:38:44 +01:00