fixed collaborators

sashazykov · sashazykov · commit 4cd4042b9424 · 2014-12-13T10:45:52.000+05:00
diff --git a/app/models/project.rb b/app/models/project.rb
@@ -50,7 +50,7 @@ def update_repository_info repo
   def update_collaborators(repo_collaborators)
     existing_collaborators = collaborators
 
-    repo_logins = repo_collaborators.map(&:login)
+    repo_logins = repo_collaborators
     existing_logins = existing_collaborators.map(&:login)
 
     existing_collaborators.each do |existing_collaborator|
diff --git a/app/services/github.rb b/app/services/github.rb
@@ -66,8 +66,8 @@ def find_project project_name
   end
 
   def collaborators_info project
-    (client.get("/repos/#{project.full_name}/collaborators") rescue []) +
-    (client.get("/orgs/#{project.full_name.split('/').first}/members") rescue [])
+    (client.get("/repos/#{project.full_name}/collaborators").map(&:login) rescue [project.full_name.split('/').first]) +
+    (client.get("/orgs/#{project.full_name.split('/').first}/members").map(&:login) rescue [])
   end
 
   def branches project
