Merge pull request #913 from LizzHale/remove-korra-preview

Remove the Organization Memberships API preview

lib/octokit/client/organizations.rb

@@ -220,7 +220,6 @@ def organization_public_member?(org, user, options = {})
       # @example
       #   @client.organization_invitations('github')
       def organization_invitations(org, options = {})
-        options = ensure_api_media_type(:org_memberships, options)
         get "#{Organization.path org}/invitations", options
       end
       alias :org_invitations :organization_invitations
@@ -236,7 +235,6 @@ def organization_invitations(org, options = {})
       # @example
       #   @client.outside_collaborators('github')
       def outside_collaborators(org, options={})
-        options = ensure_api_media_type(:org_memberships, options)
         get "#{Organization.path org}/outside_collaborators", options
       end
 
@@ -252,7 +250,6 @@ def outside_collaborators(org, options={})
       # @example
       #   @client.remove_outside_collaborator('github', 'lizzhale')
       def remove_outside_collaborator(org, user, options={})
-        options = ensure_api_media_type(:org_memberships, options)
         boolean_from_response :delete, "#{Organization.path org}/outside_collaborators/#{user}", options
       end
 
@@ -268,7 +265,6 @@ def remove_outside_collaborator(org, user, options={})
       # @example
       #   @client.convert_to_outside_collaborator('github', 'lizzhale')
       def convert_to_outside_collaborator(org, user, options={})
-        options = ensure_api_media_type(:org_memberships, options)
         boolean_from_response :put, "#{Organization.path org}/outside_collaborators/#{user}", options
       end
 
@@ -444,7 +440,6 @@ def team_member?(team_id, user, options = {})
       # @example
       #   @client.team_invitations('github')
       def team_invitations(team_id, options = {})
-        options = ensure_api_media_type(:org_memberships, options)
         get "teams/#{team_id}/invitations", options
       end
 

lib/octokit/client/repositories.rb

@@ -358,7 +358,6 @@ def collaborator?(repo, collaborator, options={})
       # @example
       #   @client.permission_level('octokit/octokit.rb', 'lizzhale')
       def permission_level(repo, collaborator, options={})
-        options = ensure_api_media_type(:org_memberships, options)
         get "#{Repository.path repo}/collaborators/#{collaborator}/permission", options
       end
 

lib/octokit/preview.rb

@@ -14,7 +14,6 @@ module Preview
       :pages                  => 'application/vnd.github.mister-fantastic-preview+json'.freeze,
       :projects               => 'application/vnd.github.inertia-preview+json'.freeze,
       :traffic                => 'application/vnd.github.spiderman-preview'.freeze,
-      :org_membership         => 'application/vnd.github.korra-preview'.freeze,
       :reviews                => 'application/vnd.github.black-cat-preview'.freeze,
       :integrations           => 'application/vnd.github.machine-man-preview+json'.freeze,
       :topics                 => 'application/vnd.github.mercy-preview+json'.freeze

spec/cassettes/Octokit_Client_Organizations/_organization_invitations/lists_pending_organization_invitations.json

@@ -1 +1 @@
-{"http_interactions":[{"request":{"method":"get","uri":"https://api.github.com/orgs/<GITHUB_TEST_ORGANIZATION>/invitations","body":{"encoding":"US-ASCII","base64_string":""},"headers":{"Accept":["application/vnd.github.korra-preview+json"],"User-Agent":["Octokit Ruby Gem 4.6.0"],"Content-Type":["application/json"],"Authorization":["token <<ACCESS_TOKEN>>"],"Accept-Encoding":["gzip;q=1.0,deflate;q=0.6,identity;q=0.3"]}},"response":{"status":{"code":200,"message":"OK"},"headers":{"Server":["GitHub.com"],"Date":["Fri, 18 Nov 2016 03:57:21 GMT"],"Content-Type":["application/json; charset=utf-8"],"Content-Length":["2"],"Status":["200 OK"],"X-Ratelimit-Limit":["5000"],"X-Ratelimit-Remaining":["3785"],"X-Ratelimit-Reset":["1479443057"],"Cache-Control":["private, max-age=60, s-maxage=60"],"Vary":["Accept, Authorization, Cookie, X-GitHub-OTP","Accept-Encoding"],"Etag":["\"74981bad1a2cd19e46517a1fba85716c\""],"X-Oauth-Scopes":["admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user"],"X-Accepted-Oauth-Scopes":["admin:org, repo"],"X-Github-Media-Type":["github.korra-preview; format=json"],"Access-Control-Expose-Headers":["ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval"],"Access-Control-Allow-Origin":["*"],"Content-Security-Policy":["default-src 'none'"],"Strict-Transport-Security":["max-age=31536000; includeSubdomains; preload"],"X-Content-Type-Options":["nosniff"],"X-Frame-Options":["deny"],"X-Xss-Protection":["1; mode=block"],"X-Served-By":["2c18a09f3ac5e4dd1e004af7c5a94769"],"X-Github-Request-Id":["32B88C12:14AE7:BB5088B:582E7C20"]},"body":{"encoding":"UTF-8","base64_string":"W10=\n"},"http_version":null},"recorded_at":"Fri, 18 Nov 2016 03:57:21 GMT"}],"recorded_with":"VCR 2.9.3"}
+{"http_interactions":[{"request":{"method":"get","uri":"https://api.github.com/orgs/<GITHUB_TEST_ORGANIZATION>/invitations","body":{"encoding":"US-ASCII","base64_string":""},"headers":{"Accept":["application/vnd.github.v3+json"],"User-Agent":["Octokit Ruby Gem 4.7.0"],"Content-Type":["application/json"],"Authorization":["token <<ACCESS_TOKEN>>"],"Accept-Encoding":["gzip;q=1.0,deflate;q=0.6,identity;q=0.3"]}},"response":{"status":{"code":200,"message":"OK"},"headers":{"Date":["Fri, 11 Aug 2017 23:44:41 GMT"],"Content-Type":["application/json; charset=utf-8"],"Content-Length":["2"],"Server":["GitHub.com"],"Status":["200 OK"],"X-Ratelimit-Limit":["5000"],"X-Ratelimit-Remaining":["4988"],"X-Ratelimit-Reset":["1502498667"],"Cache-Control":["private, max-age=60, s-maxage=60"],"Vary":["Accept, Authorization, Cookie, X-GitHub-OTP","Accept-Encoding"],"Etag":["\"6d197ddcc11f30e<GITHUB_TEST_INTEGRATION_INSTALLATION>7bd1b511ef21839\""],"X-Oauth-Scopes":["admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user"],"X-Accepted-Oauth-Scopes":["admin:org, repo"],"X-Github-Media-Type":["github.v3; format=json"],"Access-Control-Expose-Headers":["ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval"],"Access-Control-Allow-Origin":["*"],"Content-Security-Policy":["default-src 'none'"],"Strict-Transport-Security":["max-age=31536000; includeSubdomains; preload"],"X-Content-Type-Options":["nosniff"],"X-Frame-Options":["deny"],"X-Xss-Protection":["1; mode=block"],"X-Runtime-Rack":["0.027617"],"X-Github-Request-Id":["DF0D:101F6:1C7A1E:28887B:598E4168"]},"body":{"encoding":"UTF-8","base64_string":"W10=\n"},"http_version":null},"recorded_at":"Fri, 11 Aug 2017 23:44:41 GMT"}],"recorded_with":"VCR 2.9.3"}

spec/cassettes/Octokit_Client_Organizations/_outside_collaborators/lists_outside_collaborators_for_an_organization.json

@@ -1 +1 @@
-{"http_interactions":[{"request":{"method":"get","uri":"https://api.github.com/orgs/<GITHUB_TEST_ORGANIZATION>/outside_collaborators","body":{"encoding":"US-ASCII","base64_string":""},"headers":{"Accept":["application/vnd.github.korra-preview+json"],"User-Agent":["Octokit Ruby Gem 4.6.0"],"Content-Type":["application/json"],"Authorization":["token <<ACCESS_TOKEN>>"],"Accept-Encoding":["gzip;q=1.0,deflate;q=0.6,identity;q=0.3"]}},"response":{"status":{"code":200,"message":"OK"},"headers":{"Server":["GitHub.com"],"Date":["Fri, 18 Nov 2016 03:57:22 GMT"],"Content-Type":["application/json; charset=utf-8"],"Content-Length":["2"],"Status":["200 OK"],"X-Ratelimit-Limit":["5000"],"X-Ratelimit-Remaining":["3784"],"X-Ratelimit-Reset":["1479443057"],"Cache-Control":["private, max-age=60, s-maxage=60"],"Vary":["Accept, Authorization, Cookie, X-GitHub-OTP","Accept-Encoding"],"Etag":["\"74981bad1a2cd19e46517a1fba85716c\""],"X-Oauth-Scopes":["admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user"],"X-Accepted-Oauth-Scopes":["admin:org, read:org, repo, write:org"],"X-Github-Media-Type":["github.korra-preview; format=json"],"Access-Control-Expose-Headers":["ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval"],"Access-Control-Allow-Origin":["*"],"Content-Security-Policy":["default-src 'none'"],"Strict-Transport-Security":["max-age=31536000; includeSubdomains; preload"],"X-Content-Type-Options":["nosniff"],"X-Frame-Options":["deny"],"X-Xss-Protection":["1; mode=block"],"X-Served-By":["7f48e2f7761567e923121f17538d7a6d"],"X-Github-Request-Id":["32B88C12:14AE5:B454A61:582E7C22"]},"body":{"encoding":"UTF-8","base64_string":"W10=\n"},"http_version":null},"recorded_at":"Fri, 18 Nov 2016 03:57:22 GMT"}],"recorded_with":"VCR 2.9.3"}
+{"http_interactions":[{"request":{"method":"get","uri":"https://api.github.com/orgs/<GITHUB_TEST_ORGANIZATION>/outside_collaborators","body":{"encoding":"US-ASCII","base64_string":""},"headers":{"Accept":["application/vnd.github.v3+json"],"User-Agent":["Octokit Ruby Gem 4.7.0"],"Content-Type":["application/json"],"Authorization":["token <<ACCESS_TOKEN>>"],"Accept-Encoding":["gzip;q=1.0,deflate;q=0.6,identity;q=0.3"]}},"response":{"status":{"code":200,"message":"OK"},"headers":{"Date":["Fri, 11 Aug 2017 23:44:41 GMT"],"Content-Type":["application/json; charset=utf-8"],"Content-Length":["2"],"Server":["GitHub.com"],"Status":["200 OK"],"X-Ratelimit-Limit":["5000"],"X-Ratelimit-Remaining":["4987"],"X-Ratelimit-Reset":["1502498667"],"Cache-Control":["private, max-age=60, s-maxage=60"],"Vary":["Accept, Authorization, Cookie, X-GitHub-OTP","Accept-Encoding"],"Etag":["\"6d197ddcc11f30e<GITHUB_TEST_INTEGRATION_INSTALLATION>7bd1b511ef21839\""],"X-Oauth-Scopes":["admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user"],"X-Accepted-Oauth-Scopes":["admin:org, read:org, repo, write:org"],"X-Github-Media-Type":["github.v3; format=json"],"Access-Control-Expose-Headers":["ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval"],"Access-Control-Allow-Origin":["*"],"Content-Security-Policy":["default-src 'none'"],"Strict-Transport-Security":["max-age=31536000; includeSubdomains; preload"],"X-Content-Type-Options":["nosniff"],"X-Frame-Options":["deny"],"X-Xss-Protection":["1; mode=block"],"X-Runtime-Rack":["0.027<GITHUB_TEST_INTEGRATION>7"],"X-Github-Request-Id":["DF0E:101FA:46C35E:606650:598E4169"]},"body":{"encoding":"UTF-8","base64_string":"W10=\n"},"http_version":null},"recorded_at":"Fri, 11 Aug 2017 23:44:41 GMT"}],"recorded_with":"VCR 2.9.3"}