summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-02-12 10:47:34 -0800
committerGitHub <noreply@github.com>2018-02-12 10:47:34 -0800
commit240dc85d5acfa6bd21e5dc9fbfe29d8d5e7161bc (patch)
tree77e17b9e585b2fdc498bb6764a4d7468e2777422
parenta2a63b6ee82f7caabcda87cbcbb51e4fdc0fc9d9 (diff)
parentca4caad987e98b4d09d05ccdaa23543caeb86db4 (diff)
downloadchef-240dc85d5acfa6bd21e5dc9fbfe29d8d5e7161bc.tar.gz
Merge pull request #6463 from MarkGibbons/invites_sort_fail
invites_sort_fail: Clean the invites array before sorting it
-rw-r--r--lib/chef/chef_fs/data_handler/organization_invites_data_handler.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/chef_fs/data_handler/organization_invites_data_handler.rb b/lib/chef/chef_fs/data_handler/organization_invites_data_handler.rb
index c5a5f873c5..7ae08823b8 100644
--- a/lib/chef/chef_fs/data_handler/organization_invites_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/organization_invites_data_handler.rb
@@ -5,7 +5,7 @@ class Chef
module DataHandler
class OrganizationInvitesDataHandler < DataHandlerBase
def normalize(invites, entry)
- invites.map { |invite| invite.is_a?(Hash) ? invite["username"] : invite }.sort.uniq
+ invites.map { |invite| invite.is_a?(Hash) ? invite["username"] : invite }.compact.sort.uniq
end
def minimize(invites, entry)