octokit 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50843d946bedec18101a1a6e8d891bd90300c10f
-  data.tar.gz: 7d1676c589e378ccda28887ea873674bd22e5c8b
+  metadata.gz: e93f44b8f48aa69b44b90370ff09aaad974503bf
+  data.tar.gz: a57e4ac826765d57536728784d62f72c0a8ed42b
 SHA512:
-  metadata.gz: 9dc114a9fd18130673eabe703a7f730690342b4b951ee48fe89a2aee0c055847e0a77eb621109ea6ba7db98a7bfe9bc0bfc82d7947c5877692df6123fe91d8fc
-  data.tar.gz: a28fcc8ccdef9d3b8b84685e9d3d0365351cea24640420414abefaf310b02cee1642bea38ddc39f9ad9f3bba5af0bf80d5eb1b36a18318a15ba04f5905fd5179
+  metadata.gz: 9387f542df7e3bb64f3309128812807a9bee867e477c0d37408a0d8627fa430345d932afb0dd8041c27cbe0ddd57c5e0d15f724b2f8afdf2f491f5ce020e04bb
+  data.tar.gz: 8924124444df41bc5e5637fd6c9dbf641b63507386bc2670611550f688005a9b4321c4bf3c0c87520dc8337ddb27cd2dce19339e8051fc77efa20ffb5b5c7a68

data/lib/octokit/client.rb

@@ -220,6 +220,7 @@ module Octokit
     def agent
       @agent ||= Sawyer::Agent.new(api_endpoint, sawyer_options) do |http|
         http.headers[:accept] = default_media_type
+        http.headers[:content_type] = "application/json"
         http.headers[:user_agent] = user_agent
         if basic_authenticated?
           http.basic_auth(@login, @password)

data/lib/octokit/client/organizations.rb

@@ -306,8 +306,9 @@ module Octokit
       #   @client.add_team_member(100000, 'pengwynn')
       #
       # @example
-      #   # Invite a member to a team. The user won't be added to the 
-      #   # team until he/she accepts the invite via email.
+      #   # Opt-in to future behavior for this endpoint. Adds the member to the
+      #   # team if they're already an org member. If not, the method will return
+      #   # 422 and indicate the user should call the new Team Membership endpoint.
       #   @client.add_team_member \
       #     100000,
       #     'pengwynn',
@@ -496,13 +497,12 @@ module Octokit
       #
       # @example Check if a user has a membership for a team
       #   @client.team_membership(1234, 'pengwynn')
-      #   => false
       def team_membership(team_id, user, options = {})
         options = ensure_org_invitations_api_media_type(options)
         get "teams/#{team_id}/memberships/#{user}", options
       end
 
-      # Invite a user to a team
+      # Add or invite a user to a team
       #
       # @param team_id [Integer] Team id.
       # @param user [String] GitHub username of the user to invite.
@@ -513,7 +513,6 @@ module Octokit
       #
       # @example Check if a user has a membership for a team
       #   @client.add_team_membership(1234, 'pengwynn')
-      #   => false
       def add_team_membership(team_id, user, options = {})
         options = ensure_org_invitations_api_media_type(options)
         put "teams/#{team_id}/memberships/#{user}", options

data/lib/octokit/version.rb

@@ -2,6 +2,6 @@ module Octokit
 
   # Current version
   # @return [String]
-  VERSION = "3.3.0".freeze
+  VERSION = "3.3.1".freeze
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octokit
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Wynn Netherland
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,3 +131,4 @@ signing_key:
 specification_version: 4
 summary: Ruby toolkit for working with the GitHub API
 test_files: []
+has_rdoc: