Douwe MaanandRobert Speicher 96b6fb1a3d 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:39:20 -04:00

..

api

Merge branch 'container-registry-token-ttl' into 'master'

2016-06-02 13:39:56 +02:00

assets

move assets from lib directory to vendor

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

backup

Merge branch 'fix-registry-backups' into 'master'

2016-05-25 11:53:12 +02:00

banzai

Merge branch 'fix-inline-filter-speed' into 'master'

2016-06-02 16:56:42 +02:00

ci

Merge branch 'incremental-fixes' into 'master'

2016-05-25 15:00:03 +02:00

container_registry

Provide full test coverage to lib/container_registry API implementation

2016-05-17 13:20:11 -05:00

gitlab

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

2016-06-30 14:39:20 -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

Merge branch 'registry_admin_docs' into 'master'

2016-05-25 11:21:56 +02:00

tasks

Merge branch 'zj-gitignore-dropdown'

2016-05-25 13:04:26 +02:00

award_emoji.rb

Removed usage of normilizeEmojiName method

2016-04-22 21:53:26 +01: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

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

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