|
1 | 1 | /*
|
2 |
| -Gitana JavaScript Driver - Version 1.0.321 |
| 2 | +Gitana JavaScript Driver - Version 1.0.322 |
3 | 3 |
|
4 | 4 | Copyright 2019 Gitana Software, Inc.
|
5 | 5 |
|
@@ -2377,7 +2377,7 @@ if (typeof JSON !== 'object') {
|
2377 | 2377 | Gitana.requestCount = 0;
|
2378 | 2378 |
|
2379 | 2379 | // version of the driver
|
2380 |
| - Gitana.VERSION = "1.0.321"; |
| 2380 | + Gitana.VERSION = "1.0.322"; |
2381 | 2381 |
|
2382 | 2382 | // allow for optional global assignment
|
2383 | 2383 | // TODO: until we clean up the "window" variable reliance, we have to always set onto window again
|
@@ -10193,10 +10193,16 @@ Gitana.OAuth2Http.TOKEN_METHOD = "POST";
|
10193 | 10193 | getRoleKeys: function()
|
10194 | 10194 | {
|
10195 | 10195 | return this.get("roleKeys");
|
10196 |
| - } |
10197 |
| - |
| 10196 | + }, |
10198 | 10197 |
|
| 10198 | + ref: function() |
| 10199 | + { |
| 10200 | + var teamableRef = this.__teamable().ref(); |
| 10201 | + var teamableType = teamableRef.split("://")[0]; |
| 10202 | + var teamableIdentifiers = teamableRef.split("://")[1]; |
10199 | 10203 |
|
| 10204 | + return "team://" + teamableType + "/" + teamableIdentifiers + "/" + this.getId(); |
| 10205 | + } |
10200 | 10206 | });
|
10201 | 10207 |
|
10202 | 10208 | })(window);
|
@@ -27797,6 +27803,26 @@ Gitana.OAuth2Http.TOKEN_METHOD = "POST";
|
27797 | 27803 | });
|
27798 | 27804 | },
|
27799 | 27805 |
|
| 27806 | + startDryMerge: function(sourceBranchId, targetBranchId, callback) |
| 27807 | + { |
| 27808 | + var params = { |
| 27809 | + id: sourceBranchId, |
| 27810 | + dryRun: true |
| 27811 | + }; |
| 27812 | + |
| 27813 | + var uriFunction = function() |
| 27814 | + { |
| 27815 | + return "/repositories/" + this.getId() + "/branches/" + targetBranchId + "/merge/start"; |
| 27816 | + }; |
| 27817 | + |
| 27818 | + return this.chainPostResponse(this, uriFunction, params).then(function(response) { |
| 27819 | + |
| 27820 | + var jobId = response._doc; |
| 27821 | + |
| 27822 | + callback(jobId); |
| 27823 | + }); |
| 27824 | + }, |
| 27825 | + |
27800 | 27826 | /**
|
27801 | 27827 | * Performs a diff between a source and target branch. Runs as a background Job
|
27802 | 27828 | *
|
|
0 commit comments