feat: enable support for squash and rebase merges

KnisterPeter · Nov 16, 2016 · 8409d61 · 8409d61
1 parent 32a7ef6
commit 8409d61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -71,7 +71,7 @@
   "dependencies": {
     "execa": "0.5.0",
     "lru-cache": "4.0.1",
-    "pretend": "0.4.0",
+    "pretend": "0.5.0",
     "sander": "0.5.1"
   },
   "repository": {

diff --git a/src/github.ts b/src/github.ts
@@ -1,4 +1,4 @@
-import {Pretend, Get, Post, Put, Interceptor, IPretendRequestInterceptor,
+import {Pretend, Get, Post, Put, Headers, Interceptor, IPretendRequestInterceptor,
   IPretendDecoder} from 'pretend';
 import * as LRUCache from 'lru-cache';
 
@@ -178,6 +178,7 @@ namespace impl {
     @Get('/repos/:owner/:repo/commits/:ref/status')
     public getStatusForRef(): any {/* */}
 
+    @Headers('Accept: application/vnd.github.polaris-preview+json')
     @Put('/repos/:owner/:repo/pulls/:number/merge')
     public mergePullRequest(): any {/* */}