Merge branch 'stable-3.0' into stable-3.1
* stable-3.0: Bump Bazel version to 2.0.0 Set version in package.json to 3.0.7-SNAPSHOT Set version in package.json to 2.16.16-SNAPSHOT Use gerritCheck API for posting checker result Update git submodules Downport "Replace deprecated `require-jsdoc`, `valid-jsdoc` with jsdoc plugin for eslint" Downport "Add a shared pre-commit to run eslintfix for frontend code changes" Downport "Remove `|| exit 0` as eslint already supported correct exit code" Downport "Update eslint version and eslint rules" Downport "Simplify installing / running polylint" Downport "Make `npm start` run run-server.sh" Downport "Simplify installing / running template tests" Downport "Simplify installing and running eslint" Downport "Simplify running frontend tests via package.json" Change-Id: Ic08aecefc55b0434a32c6d6836fd4019e26ace72
This commit is contained in:
@@ -80,7 +80,7 @@
|
||||
|
||||
const parentCounts = revisionInfo.getParentCountMap();
|
||||
const currentParentCount = parentCounts.hasOwnProperty(patchNum) ?
|
||||
parentCounts[patchNum] : 1;
|
||||
parentCounts[patchNum] : 1;
|
||||
const maxParents = revisionInfo.getMaxParents();
|
||||
const isMerge = currentParentCount > 1;
|
||||
|
||||
@@ -178,6 +178,7 @@
|
||||
* The basePatchNum should always be <= patchNum -- because sortedRevisions
|
||||
* is sorted in reverse order (higher patchset nums first), invalid base
|
||||
* patch nums have an index greater than the index of patchNum.
|
||||
*
|
||||
* @param {number|string} basePatchNum The possible base patch num.
|
||||
* @param {number|string} patchNum The current selected patch num.
|
||||
* @param {!Array} sortedRevisions
|
||||
@@ -246,7 +247,7 @@
|
||||
_computePatchSetDescription(revisions, patchNum, opt_addFrontSpace) {
|
||||
const rev = this.getRevisionByPatchNum(revisions, patchNum);
|
||||
return (rev && rev.description) ?
|
||||
(opt_addFrontSpace ? ' ' : '') +
|
||||
(opt_addFrontSpace ? ' ' : '') +
|
||||
rev.description.substring(0, PATCH_DESC_MAX_LENGTH) : '';
|
||||
},
|
||||
|
||||
|
||||
@@ -185,7 +185,7 @@ limitations under the License.
|
||||
assert.deepEqual(element._computeBaseDropdownContent(availablePatches,
|
||||
patchNum, sortedRevisions, element.changeComments,
|
||||
element.revisionInfo),
|
||||
expectedResult);
|
||||
expectedResult);
|
||||
});
|
||||
|
||||
test('_computeBaseDropdownContent called when patchNum updates', () => {
|
||||
@@ -344,7 +344,7 @@ limitations under the License.
|
||||
|
||||
assert.deepEqual(element._computePatchDropdownContent(availablePatches,
|
||||
basePatchNum, sortedRevisions, element.changeComments),
|
||||
expectedResult);
|
||||
expectedResult);
|
||||
});
|
||||
|
||||
test('filesWeblinks', () => {
|
||||
|
||||
Reference in New Issue
Block a user