From 84d57bc70391f0419bc60c8fcffb3694078d8fb9 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 16 Sep 2015 09:14:04 +0200
Subject: Make code clearer

---
 lib/gitlab/ldap/auth_hash.rb | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'lib/gitlab')

diff --git a/lib/gitlab/ldap/auth_hash.rb b/lib/gitlab/ldap/auth_hash.rb
index dc8a8fd41dd..55deeeacd90 100644
--- a/lib/gitlab/ldap/auth_hash.rb
+++ b/lib/gitlab/ldap/auth_hash.rb
@@ -6,18 +6,16 @@ module Gitlab
       private
 
       def get_info(key)
-        raw_key = ldap_config.attributes[key]
-        return super unless raw_key
+        attributes = ldap_config.attributes[key]
+        return super unless attributes
 
-        value =
-          case raw_key
-          when String
-            get_raw(raw_key)
-          when Array
-            raw_key.inject(nil) { |value, key| value || get_raw(key).presence }
-          else
-            nil
-          end
+        attributes = Array(attributes)
+
+        value = nil
+        attributes.each do |attribute|
+          value = get_raw(attribute)
+          break if value.present?
+        end
         
         return super unless value
 
-- 
cgit v1.2.3