Merge pull request #138 from github/osowskit/media-types

Remove media types for APIs out of preview

Author: Tom Osowski

api/ruby/discovering-resources-for-a-user/discovering_repositories.rb

@@ -2,8 +2,6 @@
 
 Octokit.auto_paginate = true
 
-Octokit.default_media_type = "application/vnd.github.moondragon+json"
-
 # !!! DO NOT EVER USE HARD-CODED VALUES IN A REAL APP !!!
 # Instead, set and test environment variables, like below.
 client = Octokit::Client.new :access_token => ENV["OAUTH_ACCESS_TOKEN"]

api/ruby/ghe-org-permissions-report.rb

@@ -9,7 +9,6 @@
 # organizations
 require 'octokit'
 
-Octokit.default_media_type = 'application/vnd.github.ironman-preview+json'
 ghe = Octokit::Client.new
 
 PERMISSION_LEVELS = [:admin, :push, :pull]
@@ -98,7 +97,7 @@ def get_org_role(ghe, org_name, user_login)
           'org-admin'
         elsif org_role == 'outside-collaborator'
           'org-collaborator'
-        elsif PERMISSION_LEVELS.index(perms) < best_team_permission
+        elsif best_team_permission.nil? || PERMISSION_LEVELS.index(perms) < best_team_permission
           'org-default-permission'
         else
           'team'