Merge branch 'stable-2.15'

* stable-2.15:
  Bazel: Fix asciidoc.bzl python invocation
  Update jruby and asciidoctorj
  Move NPM version definitions into separate .bzl file in /lib
  Keep old timestamps during data migration
  PolyGerrit: Hide assignee on mobile when on the change list
  Remove vertical align from metadata titles

Change-Id: Ic40b2c5118e1bb1c3c75844d43a93f03a666e497
This commit is contained in:
Paladox
2017-10-30 18:05:37 +00:00
6 changed files with 21 additions and 18 deletions

View File

@@ -895,14 +895,14 @@ maven_jar(
maven_jar(
name = "asciidoctor",
artifact = "org.asciidoctor:asciidoctorj:1.5.4.1",
sha1 = "f7ddfb2bbed2f8da3f9ad0d1a5514f04b4274a5a",
artifact = "org.asciidoctor:asciidoctorj:1.5.6",
sha1 = "bb757d4b8b0f8438ce2ed781f6688cc6c01d9237",
)
maven_jar(
name = "jruby",
artifact = "org.jruby:jruby-complete:9.1.5.0",
sha1 = "00d0003e99da3c4d830b12c099691ce910c84e39",
artifact = "org.jruby:jruby-complete:9.1.13.0",
sha1 = "8903bf42272062e87a7cbc1d98919e0729a9939f",
)
# When upgrading Elasticsearch, make sure it's compatible with Lucene

View File

@@ -34,7 +34,8 @@ public class Schema_153 extends SchemaVersion {
// whether change is currently WIP. No migration is needed in NoteDb,
// where the value of review_started is always derived from the history
// of assignments to work_in_progress.
e.execute("UPDATE changes SET review_started = 'Y' WHERE work_in_progress = 'N'");
e.execute(
"UPDATE changes SET review_started = 'Y', created_on = created_on WHERE work_in_progress = 'N'");
}
}
}

View File

@@ -49,12 +49,12 @@ public class Schema_159 extends SchemaVersion {
// if they have any draft patch sets.
e.execute(
String.format(
"UPDATE changes SET %s = 'Y' WHERE status = 'd' OR "
"UPDATE changes SET %s = 'Y', created_on = created_on WHERE status = 'd' OR "
+ "EXISTS (SELECT * FROM patch_sets WHERE "
+ "patch_sets.change_id = changes.change_id AND patch_sets.draft = 'Y')",
column));
// Change change status from draft to new.
e.execute("UPDATE changes SET status = 'n' WHERE status = 'd'");
e.execute("UPDATE changes SET status = 'n', created_on = created_on WHERE status = 'd'");
}
ui.message("done");
}

11
lib/js/npm.bzl Normal file
View File

@@ -0,0 +1,11 @@
NPM_VERSIONS = {
"bower": "1.8.2",
"crisper": "2.0.2",
"vulcanize": "1.14.8",
}
NPM_SHA1S = {
"bower": "adf53529c8d4af02ef24fb8d5341c1419d33e2f7",
"crisper": "7183c58cea33632fb036c91cefd1b43e390d22a2",
"vulcanize": "679107f251c19ab7539529b1e3fdd40829e6fc63",
}

View File

@@ -47,6 +47,7 @@ def _replace_macros_impl(ctx):
inputs = [ctx.file._exe, ctx.file.src],
outputs = [ctx.outputs.out],
command = cmd,
use_default_shell_env = True,
progress_message = "Replacing macros in %s" % ctx.file.src.short_path,
)

View File

@@ -2,17 +2,7 @@ NPMJS = "NPMJS"
GERRIT = "GERRIT:"
NPM_VERSIONS = {
"bower": "1.8.2",
"crisper": "2.0.2",
"vulcanize": "1.14.8",
}
NPM_SHA1S = {
"bower": "adf53529c8d4af02ef24fb8d5341c1419d33e2f7",
"crisper": "7183c58cea33632fb036c91cefd1b43e390d22a2",
"vulcanize": "679107f251c19ab7539529b1e3fdd40829e6fc63",
}
load("//lib/js:npm.bzl", "NPM_VERSIONS", "NPM_SHA1S")
def _npm_tarball(name):
return "%s@%s.npm_binary.tgz" % (name, NPM_VERSIONS[name])