Merge master into prod, release: v1.1.37

bitrise-io · Nov 22, 2017 · 369e472 · 369e472
2 parents d03255a + 96af00c
commit 369e472
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/service/hook/bitbucketv2/bitbucketv2.go b/service/hook/bitbucketv2/bitbucketv2.go
@@ -120,7 +120,7 @@ func detectContentTypeAttemptNumberAndEventKey(header http.Header) (string, stri
 
 	attemptNum := header.Get("X-Attempt-Number")
 	if attemptNum == "" {
-		return "", "", "", errors.New("No X-Attempt-Number Header found")
+		attemptNum = "1"
 	}
 
 	return contentType, attemptNum, eventKey, nil

diff --git a/service/hook/bitbucketv2/bitbucketv2_test.go b/service/hook/bitbucketv2/bitbucketv2_test.go
@@ -245,10 +245,10 @@ func Test_detectContentTypeAttemptNumberAndEventKey(t *testing.T) {
 			"Content-Type": {"application/json"},
 		}
 		contentType, attemptNum, eventKey, err := detectContentTypeAttemptNumberAndEventKey(header)
-		require.EqualError(t, err, "No X-Attempt-Number Header found")
-		require.Equal(t, "", contentType)
-		require.Equal(t, "", eventKey)
-		require.Equal(t, "", attemptNum)
+		require.NoError(t, err)
+		require.Equal(t, "application/json", contentType)
+		require.Equal(t, "repo:push", eventKey)
+		require.Equal(t, "1", attemptNum)
 	}
 }
 

diff --git a/version/version.go b/version/version.go
@@ -1,4 +1,4 @@
 package version
 
 // VERSION ...
-const VERSION = "1.1.36"
+const VERSION = "1.1.37"