Douwe MaanandRobert Speicher 142324ac13 Merge branch '19312-confidential-issue' into 'master' ...

Fix privilege escalation issue with OAuth external users

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/19312

This MR fixes a privilege escalation issue, where manually set external users would be reverted back to internal users if they logged in via OAuth and that provider was not in the `external_providers` list.

/cc @douwe

See merge request !1975
(cherry picked from commit 5e6342b7ac)

2016-06-30 14:38:49 -04:00

..

banzai

Merge branch '16568-relative-links-wiki-regression' into 'master'

2016-05-12 15:03:49 +02:00

ci

Merge branch 'fix/hidden-build-validation-in-ci-yaml' into 'master'

2016-04-25 21:54:25 +02:00

gitlab

Merge branch '19312-confidential-issue' into 'master'

2016-06-30 14:38:49 -04:00

award_emoji_spec.rb

Emoji categories fix

2016-04-14 20:45:55 +03:00

disable_email_interceptor_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

extracts_path_spec.rb

Added & use Gitlab::Routing for URL helpers

2016-04-01 11:13:48 +02:00

file_size_validator_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

git_ref_validator_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

gitlab_spec.rb

Add Gitlab.com? method

2016-04-12 17:30:11 -04:00

repository_cache_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00