diff options
| author | James Lopez <james@jameslopez.es> | 2016-04-04 21:03:25 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-04-04 21:03:25 +0300 |
| commit | 7f7769172e81dc8bfdb037965ec7bf51c95578ec (patch) | |
| tree | 0a0f8a6f704ddb79edf8cc600a72b4ccf760a4c2 /lib/gitlab/fogbugz_import | |
| parent | 4835e680a4624ab8de3316b367b8375bb5a270a0 (diff) | |
| parent | 531e4bdac8c409a25aa862c644dcab00960c82c4 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/gitlab/fogbugz_import')
| -rw-r--r-- | lib/gitlab/fogbugz_import/client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/fogbugz_import/client.rb b/lib/gitlab/fogbugz_import/client.rb index 431d50882fd..2152182b37f 100644 --- a/lib/gitlab/fogbugz_import/client.rb +++ b/lib/gitlab/fogbugz_import/client.rb @@ -26,7 +26,7 @@ module Gitlab def user_map users = {} res = @api.command(:listPeople) - res['people']['person'].each do |user| + [res['people']['person']].flatten.each do |user| users[user['ixPerson']] = { name: user['sFullName'], email: user['sEmail'] } end users |