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

..

api

Merge branch 'fix-project-hook-delete-permissions' into 'master'

2016-04-27 13:32:55 -04:00

assets

move assets from lib directory to vendor

2012-05-29 17:56:48 +05:00

backup

Make sure there is a connection before using ActiveRecord

2016-02-08 17:31:24 +01: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

omni_auth

Fix signin with OmniAuth providers

2015-12-08 14:58:15 +01:00

rouge/formatters

Remove custom Lexer. #3945 [ci skip]

2016-01-08 15:20:48 -05:00

support

Remove deprecated NGINX CI config

2016-04-14 20:31:19 +03:00

tasks

Merge branch 'cascade_drop' into 'master'

2016-05-11 11:06:09 +02:00

award_emoji.rb

Merge branch 'emoji-unicode-fix' into 'master'

2016-04-26 16:05:12 +00:00

banzai.rb

Add a PreProcessPipeline

2016-03-02 22:19:36 -05:00

disable_email_interceptor.rb

Add email interceptor to prevent mail sending if email sending is disabled.

2014-10-27 13:05:50 +01:00

event_filter.rb

Fix rubocop warnings in lib

2015-10-03 01:29:58 -05:00

extracts_path.rb

Only render 404 page from /public

2015-10-13 20:12:34 +03:00

file_size_validator.rb

Merge branch '15139-fix-constants-redefinition-warnings' into 'master'

2016-04-20 10:47:48 +02:00

file_streamer.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

gitlab.rb

Add Gitlab.com? method

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

gt_one_coercion.rb

diff unfold

2014-08-14 15:48:14 +04:00

repository_cache.rb

Store commit count in project table

2015-07-17 15:22:56 +02:00

static_model.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00

unfold_form.rb

Gitlab Issue 707: Indent unfolded code 1 character

2015-07-22 09:58:17 -04:00

uploaded_file.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

version_check.rb

Update version check images to use SVG

2016-01-05 14:35:29 -05:00