diff options
| author | Marin Jankovski <marin@gitlab.com> | 2016-04-13 13:09:47 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2016-04-13 13:09:47 +0000 |
| commit | c74604699269a2edbbe937309cce7a4ed789cb07 (patch) | |
| tree | 3dc05906df853581ffed364ae554d3aeeedcd19f /CHANGELOG | |
| parent | ab4ea3720c084063ab83cef3aaf3a0b6adbc2a3c (diff) | |
| parent | 61fc9aa87ea3752f3c7b853ab1cb102e53d392f2 (diff) | |
| download | gitlab-ce-c74604699269a2edbbe937309cce7a4ed789cb07.tar.gz | |
Merge branch 'external-omniauth-providers' into 'master'
Allow Omniauth providers to be marked as external
Related to #4009
With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login.
MR for Omnibus: gitlab-org/omnibus-gitlab!727
/cc @dblessing @DouweM
See merge request !3657
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index ed59bc1b252..5399e3e5b8b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,6 +22,7 @@ v 8.7.0 (unreleased) - Fix avatar stretching by providing a cropping feature - API: Expose `subscribed` for issues and merge requests (Robert Schilling) - Allow SAML to handle external users based on user's information !3530 + - Allow Omniauth providers to be marked as `external` !3657 - Add endpoints to archive or unarchive a project !3372 - Add links to CI setup documentation from project settings and builds pages - Handle nil descriptions in Slack issue messages (Stan Hu) |