Merge branch 'release-0.2.15' into develop

ishashchuk · Feb 20, 2017 · ea77900 · ea77900
2 parents 6bb6392 + ffe9b93
commit ea77900
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,19 @@
 Changelog
 =========
 
+v0.2.15 (2016-08-30)
+
+	Features
+		* Allow float and boolean in Query()'s queryStruct @davyzhang
+		* Support Map in Query() @yangmls
+		* Support Map in Send() @longlongh4
+		* Document RedirectPolicy @codegoalie
+		* Enable Debug mode by ENV variable @heytitle
+		* Add Retry() @xild
+	Bug/Fixes
+		* Allow bodies with all methods @pkopac
+		* Change std "errors" pkg to "github.com/pkg/errors" @pkopac
+
 v0.2.14 (2016-08-30)
 
 	Features

diff --git a/README.md b/README.md
@@ -166,7 +166,7 @@ The `SendFile` function accepts `strings` as path to a file, `[]byte` slice or e
 ```go
           f, _ := filepath.Abs("./file2.txt")
 bytesOfFile, _ := ioutil.ReadFile(f)
-    
+
 gorequest.New().Post("http://example.com/").
   Type("multipart").
   SendFile("./file1.txt").
@@ -235,7 +235,7 @@ var heyYou heyYou
 resp, _, errs := gorequest.New().Get("http://example.com/").EndStruct(&heyYou)
 ```
 
-## Retry 
+## Retry
 
 Supposing you need retry 3 times, with 5 seconds between each attempt when gets a BadRequest or a InternalServerError
 
@@ -288,25 +288,32 @@ Thanks to all contributors thus far:
 
 |   Contributors                        |
 |---------------------------------------|
-| https://github.com/kemadz             |
+| https://github.com/alaingilbert       |
 | https://github.com/austinov           |
-| https://github.com/figlief            |
+| https://github.com/coderhaoxin        |
+| https://github.com/codegoalie         |
+| https://github.com/dafang             |
+| https://github.com/davyzhang          |
 | https://github.com/dickeyxxx          |
+| https://github.com/figlief            |
+| https://github.com/fraenky8           |
+| https://github.com/franciscocpg       |
+| https://github.com/heytitle           |
+| https://github.com/hownowstephen      |
+| https://github.com/kemadz             |
 | https://github.com/killix             |
 | https://github.com/jaytaylor          |
 | https://github.com/na-ga              |
-| https://github.com/dafang             |
-| https://github.com/alaingilbert       |
-| https://github.com/6david9            |
+| https://github.com/piotrmiskiewicz    |
 | https://github.com/pencil001          |
+| https://github.com/pkopac             |
+| https://github.com/quangbuule         |
 | https://github.com/QuentinPerez       |
 | https://github.com/smallnest          |
-| https://github.com/piotrmiskiewicz    |
-| https://github.com/coderhaoxin        |
 | https://github.com/WaveCutz           |
-| https://github.com/fraenky8           |
-| https://github.com/franciscocpg       |
-| https://github.com/quangbuule         |
+| https://github.com/xild               |
+| https://github.com/yangmls            |
+| https://github.com/6david9            |
 
 
 Also, co-maintainer is needed here. If anyone is interested, please email me (parnurzeal at gmail.com)