gitlab-org--gitlab-foss/app
Douwe Maan 8c0aa7d4a7 Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'
(10.2) Avoid partial partial email adresses for matching

See merge request gitlab/gitlabhq!2232

(cherry picked from commit 081aa1e91a777c9acb31be4a1e76b3dd7032fa9a)

There are unresolved conflicts in app/models/user.rb.

fa85a3fd Don't allow searching for partial user emails
2017-12-08 13:47:18 -08:00
..
assets Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master' 2017-12-08 17:11:53 +00:00
controllers Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into 'security-10-2' 2017-12-08 13:44:36 -08:00
finders Merge branch '35616-move-k8-to-cluster-page' into cluster-page-with-list-clusters 2017-12-05 13:29:41 +01:00
helpers Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into 'security-10-2' 2017-12-08 13:44:36 -08:00
mailers
models Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2' 2017-12-08 13:47:18 -08:00
policies Support uploads for groups 2017-12-07 12:27:52 +01:00
presenters Merge branch 'list-multiple-clusters' into 'master' 2017-12-06 09:07:52 +00:00
serializers Use actual head pipeline on merge request serializer 2017-12-05 12:54:10 -02:00
services Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master' 2017-12-08 14:15:33 +00:00
uploaders Support uploads for groups 2017-12-07 12:27:52 +01:00
validators
views Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master' 2017-12-08 17:11:53 +00:00
workers Fix update head pipeline worker 2017-12-05 15:14:37 -02:00