Douwe MaanandRobert Speicher ad421b3ac6 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:40:58 -04:00

..

api

Merge branch '17521-gitlab-ci-yml-templates' into 'master'

2016-06-21 12:17:47 -04:00

assets

…

backup

Only create the backup directory if it is local

2016-06-10 10:17:54 -07:00

banzai

Merge branch 'refactor-rendering-redacting' into 'master'

2016-06-24 11:28:39 -04:00

ci

Merge branch 'feature/runner-lock-on-project' into 'master'

2016-06-21 12:17:20 -04:00

container_registry

Merge branch 'show-image-id-on-registry-page' into 'master'

2016-06-21 12:07:57 -04:00

gitlab

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

2016-06-30 14:40:58 -04:00

json_web_token

Rename JWT to JSONWebToken

2016-05-14 18:23:31 -05: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

Add note about port needed in NGINX config

2016-05-22 19:20:28 -05:00

tasks

Merge branch 'feature/import-export-docs' into 'master'

2016-06-22 15:46:55 +02:00

banzai.rb

Merge branch 'remove-banzai-pre-process' into 'master'

2016-06-21 14:25:30 -04: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

Add leading comment space cop

2016-05-31 19:33:46 -03:00

extracts_path.rb

Only render 404 page from /public

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

file_size_validator.rb

Get rid of more requires, which causes warnings when code is reloaded

2016-04-19 11:48:10 +02:00

file_streamer.rb

Implement Build Artifacts

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

gitlab.rb

Fix a few places where autoloading would fail

2016-05-10 11:51:19 +02:00

gt_one_coercion.rb

…

repository_cache.rb

Store commit count in project table

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

static_model.rb

…

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