Merge branch 'stable-2.12' * stable-2.12: Update 2.12 release notes Upgrade Jetty to 9.2.13.v20150730 Upgrade JGit to 4.1.0.201509280440-r Change-Id: I4cfb3f6d612ff19fc4c0ea83420315414b2b8513
diff --git a/ReleaseNotes/ReleaseNotes-2.12.txt b/ReleaseNotes/ReleaseNotes-2.12.txt index c6efb46..4bfe90d 100644 --- a/ReleaseNotes/ReleaseNotes-2.12.txt +++ b/ReleaseNotes/ReleaseNotes-2.12.txt
@@ -155,6 +155,10 @@ * Show push certificate status. +* Show change subject as tooltip on related changes list. ++ +This helps to identify changes when the subject is truncated in the list. + Side-By-Side Diff ^^^^^^^^^^^^^^^^^ @@ -197,15 +201,21 @@ * Support pagination with `--start` and `--end` in the list tags endpoint. -Other -~~~~~ +SSH +~~~ -* Add support for SSH ZLib Compression. +* Add support for ZLib Compression. + To enable compression use the link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.12/config-gerrit.html#sshd.enableCompression[ `sshd.enableCompression` setting]. +* Add support for hmac-sha2-256 and hmac-sha2-512 as MACs. + + +Other +~~~~~ + * link:http://code.google.com/p/gerrit/issues/detail?id=2061[Issue 2061] Add Support for `git-upload-archive`. + @@ -240,7 +250,28 @@ Bug Fixes --------- -* TODO +* link:http://code.google.com/p/gerrit/issues/detail?id=3653[Issue 3653]: +Correct timezone in sshd log after DST change. ++ +When encountering a DST switch, the timezone wasn't updated until +the server was reloaded. + +* Make email validation case insensitive. ++ +While link:https://tools.ietf.org/html/rfc5321#section-2.3.11[ +RFC 5321 section 2.3.11] allows for the local-part (the part left of +the '@') of an email address to be case sensitive, the domain portion is +case insensitive according to +link:https://tools.ietf.org/html/rfc1035#section-3.1[RFC 1035 section 3.1]. +And in practice, even the local-part is typically case insensitive also. + +* commit-msg hook: Don't add Change-Id line on temporary commits. ++ +Commits created with `git commit --fixup` or `git commit --squash` are not +intended to be pushed to Gerrit, and don't need a `Change-Id` line. ++ +This also prevents changes from being accidentally uploaded, at least for +projects that have the 'Require Change-Id' configuration enabled. Upgrades @@ -264,9 +295,9 @@ * Upgrade httpcomponents to 4.4.1 -* Upgrade jetty to 9.2.12.v20150709 +* Upgrade Jetty to 9.2.13.v20150730 -* Upgrade JGit to 4.0.1.201506240215-r.94-g39dc898 +* Upgrade JGit to 4.1.0.201509280440-r * Upgrade joda-time to 2.8
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java index d3a88d8..a3a107d 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java
@@ -47,6 +47,7 @@ @TestProjectInput(createEmptyCommit = false) public void listBranchesOfEmptyProject() throws Exception { assertBranches(ImmutableList.of( + branch("HEAD", null, false), branch("refs/meta/config", null, false)), list().get()); }
diff --git a/lib/jetty/BUCK b/lib/jetty/BUCK index d02916f..342ae61 100644 --- a/lib/jetty/BUCK +++ b/lib/jetty/BUCK
@@ -1,12 +1,12 @@ include_defs('//lib/maven.defs') -VERSION = '9.2.12.v20150709' +VERSION = '9.2.13.v20150730' EXCLUDE = ['about.html'] maven_jar( name = 'servlet', id = 'org.eclipse.jetty:jetty-servlet:' + VERSION, - sha1 = '50116cac18ad893c9628f0a1984390464b133921', + sha1 = '5ad6e38015a97ae9a60b6c2ad744ccfa9cf93a50', license = 'Apache2.0', deps = [':security'], exclude = EXCLUDE, @@ -15,7 +15,7 @@ maven_jar( name = 'security', id = 'org.eclipse.jetty:jetty-security:' + VERSION, - sha1 = '9ace95998fbaae8425b2621c90230a229a554784', + sha1 = 'cc7c7f27ec4cc279253be1675d9e47e58b995943', license = 'Apache2.0', deps = [':server'], exclude = EXCLUDE, @@ -25,7 +25,7 @@ maven_jar( name = 'servlets', id = 'org.eclipse.jetty:jetty-servlets:' + VERSION, - sha1 = 'a1f9e7874e1db2f664213f524463d12bd5ab5db4', + sha1 = '23eb48f1d889d45902e400750460d4cd94d74663', license = 'Apache2.0', exclude = EXCLUDE, visibility = [ @@ -37,7 +37,7 @@ maven_jar( name = 'server', id = 'org.eclipse.jetty:jetty-server:' + VERSION, - sha1 = '8c90ceffb6954385b024899d334192947d0e4077', + sha1 = '5be7d1da0a7abffd142de3091d160717c120b6ab', license = 'Apache2.0', exported_deps = [ ':continuation', @@ -49,7 +49,7 @@ maven_jar( name = 'jmx', id = 'org.eclipse.jetty:jetty-jmx:' + VERSION, - sha1 = '8bc0288abba26dbbf4e9225d6fe6fa6348f8da05', + sha1 = 'a2ebbbcb47ed98ecd23be550f77e8dadc9f9a800', license = 'Apache2.0', exported_deps = [ ':continuation', @@ -61,7 +61,7 @@ maven_jar( name = 'continuation', id = 'org.eclipse.jetty:jetty-continuation:' + VERSION, - sha1 = '0578cb87b78b71eeda91f5dfa3e8bfbafb55cced', + sha1 = 'f6bd4e6871ecd0a5e7a5e5addcea160cd73f81bb', license = 'Apache2.0', exclude = EXCLUDE, ) @@ -69,7 +69,7 @@ maven_jar( name = 'http', id = 'org.eclipse.jetty:jetty-http:' + VERSION, - sha1 = '9a6c83f52c70c28e2272d83866b4111cd15ddbc5', + sha1 = '23a745d9177ef67ef53cc46b9b70c5870082efc2', license = 'Apache2.0', exported_deps = [':io'], exclude = EXCLUDE, @@ -78,7 +78,7 @@ maven_jar( name = 'io', id = 'org.eclipse.jetty:jetty-io:' + VERSION, - sha1 = 'c02e9e303d231a589e0c8866c1ee89bcdeb40a55', + sha1 = '7a351e6a1b63dfd56b6632623f7ca2793ffb67ad', license = 'Apache2.0', exported_deps = [':util'], exclude = EXCLUDE, @@ -88,7 +88,7 @@ maven_jar( name = 'util', id = 'org.eclipse.jetty:jetty-util:' + VERSION, - sha1 = 'd99d38adfdb5ec677643f04fa862554b0bb8b42e', + sha1 = 'c101476360a7cdd0670462de04053507d5e70c97', license = 'Apache2.0', exclude = EXCLUDE, visibility = [],
diff --git a/lib/jgit/BUCK b/lib/jgit/BUCK index 4e47cc7..9cdfbf4 100644 --- a/lib/jgit/BUCK +++ b/lib/jgit/BUCK
@@ -1,13 +1,13 @@ include_defs('//lib/maven.defs') -REPO = GERRIT # Leave here even if set to MAVEN_CENTRAL. -VERS = '4.0.1.201506240215-r.94-g39dc898' +REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL. +VERS = '4.1.0.201509280440-r' maven_jar( name = 'jgit', id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS, - bin_sha1 = 'e076b3f71daaadd27e9cfc810778968deed04038', - src_sha1 = '255a8c836c1a85da9ffc371ba3e59e63c2bc1dee', + bin_sha1 = '6410f290b796184df95d321a18d4c3665ba542a8', + src_sha1 = 'a681c59ec854b3e55f3abff8442e3e4ece31fa70', license = 'jgit', repository = REPO, unsign = True, @@ -22,7 +22,7 @@ maven_jar( name = 'jgit-servlet', id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS, - sha1 = '4d4346164f89593a82670780fd041be358ab76c9', + sha1 = '2f86ccebd5b5e0837757d35f63f04471432c13b8', license = 'jgit', repository = REPO, deps = [':jgit'], @@ -36,7 +36,7 @@ maven_jar( name = 'jgit-archive', id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS, - sha1 = '96408a19e7506bf19f25b55574ca212a3e789961', + sha1 = 'd6d0ec8d77cea3b7efeac9789140f8373c10454b', license = 'jgit', repository = REPO, deps = [':jgit', @@ -53,7 +53,7 @@ maven_jar( name = 'junit', id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS, - sha1 = '172e9b034bdd85b9611f3958258733fd74889cc7', + sha1 = '69ef53175d9f150bc4072f8f5ba9046bf14cc55f', license = 'DO_NOT_DISTRIBUTE', repository = REPO, unsign = True,