Raise Octokit::Conflict for 409 errors

ethnt · Oct 21, 2013 · 0a6ff62 · 0a6ff62
1 parent 925aa60
commit 0a6ff62
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/octokit/error.rb b/lib/octokit/error.rb
@@ -18,6 +18,7 @@ def self.from_response(response)
                   when 403      then error_for_403(body)
                   when 404      then Octokit::NotFound
                   when 406      then Octokit::NotAcceptable
+                  when 409      then Octokit::Conflict
                   when 415      then Octokit::UnsupportedMediaType
                   when 422      then Octokit::UnprocessableEntity
                   when 400..499 then Octokit::ClientError
@@ -184,6 +185,9 @@ class NotFound < ClientError; end
   # Raised when GitHub returns a 406 HTTP status code
   class NotAcceptable < ClientError; end
 
+  # Raised when GitHub returns a 409 HTTP status code
+  class Conflict < ClientError; end
+
   # Raised when GitHub returns a 414 HTTP status code
   class UnsupportedMediaType < ClientError; end