From eb0f1de36c6ebf13d86540bb79d7fb07fc3642f0 Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Wed, 6 Apr 2016 16:21:58 -0500
Subject: [PATCH] Added CHANGELOG item
---
CHANGELOG | 1 +
lib/gitlab/saml/user.rb | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index f72bb670ece..1b3fd97a1cf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.7.0 (unreleased)
- Expose label description in API (Mariusz Jachimowicz)
- Allow back dating on issues when created through the API
- Fix avatar stretching by providing a cropping feature
+ - Allow SAML to handle external users based on user's information !3530
- 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)
diff --git a/lib/gitlab/saml/user.rb b/lib/gitlab/saml/user.rb
index 6ab165cf518..73fc443a02b 100644
--- a/lib/gitlab/saml/user.rb
+++ b/lib/gitlab/saml/user.rb
@@ -33,7 +33,6 @@ module Gitlab
# Avoid an unnecessary change of values and the subsequent save
@user.external = false if @user.external
else
- # Avoid an unnecessary change of values and the subsequent save
@user.external = true unless @user.external
end
end
--
GitLab