Skip to content

Commit 1ea5b43

Browse files
committed
update to latest release
1 parent 3ec627d commit 1ea5b43

File tree

3 files changed

+32
-6
lines changed

3 files changed

+32
-6
lines changed

Diff for: lib/gitana.js

+30-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Gitana JavaScript Driver - Version 1.0.321
2+
Gitana JavaScript Driver - Version 1.0.322
33

44
Copyright 2019 Gitana Software, Inc.
55

@@ -2377,7 +2377,7 @@ if (typeof JSON !== 'object') {
23772377
Gitana.requestCount = 0;
23782378

23792379
// version of the driver
2380-
Gitana.VERSION = "1.0.321";
2380+
Gitana.VERSION = "1.0.322";
23812381

23822382
// allow for optional global assignment
23832383
// 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";
1019310193
getRoleKeys: function()
1019410194
{
1019510195
return this.get("roleKeys");
10196-
}
10197-
10196+
},
1019810197

10198+
ref: function()
10199+
{
10200+
var teamableRef = this.__teamable().ref();
10201+
var teamableType = teamableRef.split("://")[0];
10202+
var teamableIdentifiers = teamableRef.split("://")[1];
1019910203

10204+
return "team://" + teamableType + "/" + teamableIdentifiers + "/" + this.getId();
10205+
}
1020010206
});
1020110207

1020210208
})(window);
@@ -27797,6 +27803,26 @@ Gitana.OAuth2Http.TOKEN_METHOD = "POST";
2779727803
});
2779827804
},
2779927805

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+
2780027826
/**
2780127827
* Performs a diff between a source and target branch. Runs as a background Job
2780227828
*

Diff for: lib/gitana.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"author": "Gitana Software, Inc. <[email protected]> (http://www.cloudcms.com)",
33
"name": "gitana",
44
"description": "Cloud CMS Gitana Driver for Node JS",
5-
"version": "1.0.321",
5+
"version": "1.0.322",
66
"repository": {
77
"type": "git",
88
"url": "git://github.com/gitana/gitana-node-js.git"

0 commit comments

Comments
 (0)