From 40b683d209f255bef04d7afd5eefd249e2d10347 Mon Sep 17 00:00:00 2001 From: Colby Ranger Date: Wed, 20 Nov 2013 15:38:20 -0800 Subject: [PATCH 1/6] Extend ChangeScreen2 horizontal bars to full width. This allows the title of the change message to have some padding within the bar. Also, removed the implicit 1px padding from the th element in the infoTable, so it lines up correctly with the 'Files' text. Change-Id: Id16963bd5828f6a28869657a1d76285b54f8c778 --- .../com/google/gerrit/client/change/ChangeScreen2.ui.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml index 675a362ae0..9090744871 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml @@ -37,6 +37,8 @@ limitations under the License. position: relative; background-color: trimColor; height: HEADER_HEIGHT; + margin: 0 -5px; + padding: 0 5px; } .idBlock { @@ -131,7 +133,7 @@ limitations under the License. font-weight: normal; vertical-align: top; text-align: left; - padding-right: 5px; + padding: 0 5px 0 0; } .clippy div { @@ -246,7 +248,8 @@ limitations under the License. font-weight: bold; color: textColor; height: 18px; - padding: 5px 10px; + margin: 0 -5px; + padding: 5px 5px; } .sectionHeader .headerButtons { top: 2px; From fb3b88ac0ef8860b546d784650ff290efb7d56ee Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Tue, 17 Dec 2013 17:33:56 -0800 Subject: [PATCH 2/6] SideBySide2: Fix tab alignment to be correct width CSS :before selector inserting a string shifts the rest of the element text right by the width of the string, as the string is part of the page layout. Use "position: absolute" to take this inserted character out of the layout, drawing it on top of the space/tab instead of before it. This fixes the tab width to be the user's preference, rather than 1 + user's preference when show tabs is enabled. Change-Id: I1a9ffdcf0eafac7037dfb52b3e792e5ca9fd5e56 --- .../src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml index 3764cd1840..28b3c4fc32 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml @@ -104,6 +104,7 @@ limitations under the License. z-index: 2; } .showtabs .cm-tab:before { + position: absolute; content: "\00bb"; color: #f00; } From 4c6b14b2904e44475efaba4e04b3010715beebbf Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Tue, 4 Feb 2014 11:03:43 +0900 Subject: [PATCH 3/6] SideBySide2: Fill the browser width Filling the browser available space with the CM3 instances each at 50% size allows the user to more easily view long lines if they have a wide display, and better fit on more narrow displays by splitting the available width at 50%. Change-Id: Iddeb0b6b43406ddb9f72d8dd369cedab2907e297 --- .../src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml index 28b3c4fc32..5e280a9a24 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml @@ -27,7 +27,6 @@ limitations under the License. border-bottom: 1px solid #ddd; } - .difftable { max-width: 1484px; } .difftable .CodeMirror-lines { padding: 0; } .difftable .CodeMirror pre { padding: 0; From 38e6f4462cf0c2cb913eb8a26d6f5d234c128b0c Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sat, 18 Jan 2014 09:58:41 +0100 Subject: [PATCH 4/6] Buck: Decouple plugin-api installation from deployment Currently the same pom_fake.xml controls both installing the plugin-api in local Maven repository (typical use case for a contributor) and deploying it on Google bucket (typical use case for a maintainer). To fit the both use cases that file contains stuff needed for uploading to Google bucket only: 'gs-maven-wagon' artifact and the repository to fetch it from. Because the "best" build tool in the world randomly and unreproducible fails to fetch that artifact [1], frustrating the potential contributors, for reasons that nobody knows and understands, separate these use cases from each other, and strip the stuff from pom_fake.xml needed for deployment of plugin-api. The cost is code duplication. The advantage of doing it: buck build api_install just works. Always. [1] https://gist.github.com/mulby/092fee5f5962aafbbb25#file-gerrit-build-error-txt Change-Id: I842335907ef8721f4126bcd90e395f7748aefc74 --- tools/maven/{fake_pom.xml => fake_pom_deploy.xml} | 0 tools/maven/fake_pom_install.xml | 6 ++++++ tools/maven/mvn.py | 8 +++++--- 3 files changed, 11 insertions(+), 3 deletions(-) rename tools/maven/{fake_pom.xml => fake_pom_deploy.xml} (100%) create mode 100644 tools/maven/fake_pom_install.xml diff --git a/tools/maven/fake_pom.xml b/tools/maven/fake_pom_deploy.xml similarity index 100% rename from tools/maven/fake_pom.xml rename to tools/maven/fake_pom_deploy.xml diff --git a/tools/maven/fake_pom_install.xml b/tools/maven/fake_pom_install.xml new file mode 100644 index 0000000000..d066a4a97c --- /dev/null +++ b/tools/maven/fake_pom_install.xml @@ -0,0 +1,6 @@ + + 4.0.0 + com.google.gerrit + Gerrit-Code-Review-Maven + 1 + diff --git a/tools/maven/mvn.py b/tools/maven/mvn.py index bdf5d01591..18f52cb5b2 100644 --- a/tools/maven/mvn.py +++ b/tools/maven/mvn.py @@ -19,6 +19,9 @@ from os import path from sys import stderr from util import check_output +def mvn(action): + return ['mvn', '--file', path.join(self, 'fake_pom_%s.xml' % action)] + opts = OptionParser() opts.add_option('--repository', help='maven repository id') opts.add_option('--url', help='maven repository url') @@ -38,12 +41,11 @@ common = [ ] self = path.dirname(path.abspath(__file__)) -mvn = ['mvn', '--file', path.join(self, 'fake_pom.xml')] if 'install' == args.a: - cmd = mvn + ['install:install-file'] + common + cmd = mvn(args.a) + ['install:install-file'] + common elif 'deploy' == args.a: - cmd = mvn + [ + cmd = mvn(args.a) + [ 'deploy:deploy-file', '-DrepositoryId=%s' % args.repository, '-Durl=%s' % args.url, From f067fc081ac2a14c0563a332b4f289f51c0ac6d2 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 17 Jan 2014 20:34:33 +0100 Subject: [PATCH 5/6] Update change to invalidate cache after deletion of draft revision When draft revision is deleted the change is updated only when the current draft patch set was deleted. That's because new current patch set field must be updated in the database. However when non current draft patch set was deleted no update of the change happen. That breaks CS2 as it relies on browser side cached ETag and computation of ETag on the server side. Because nothing is changed, the ETags are the same and HTTP status 304 is returned. Update the change also if non current draft patch set was deleted. The only alternative to this approach is to decouple draft revision retrieval from /changes//detail endpoint. Bug: issue 2405 Change-Id: I80f2331362ba61306c9436921ebf153b23c3c4bc (cherry picked from commit a50fa6761f306aa774e34dd5dc356180743dcbbd) --- .../gerrit/server/change/DeleteDraftPatchSet.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftPatchSet.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftPatchSet.java index 3265c815e8..f4980f9886 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftPatchSet.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftPatchSet.java @@ -121,8 +121,11 @@ public class DeleteDraftPatchSet implements RestModifyView() { @Override public Change update(Change c) { - c.setCurrentPatchSet(psInfo); + if (psInfo != null) { + c.setCurrentPatchSet(psInfo); + } ChangeUtil.updated(c); return c; } From 4ff2f2c54b80b88c3ea91b89fa385e011116ea30 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 12 Feb 2014 23:08:26 +0900 Subject: [PATCH 6/6] Update 2.8.2 release notes with recently merged changes Change-Id: I3ab898626bea028db085d49f6f9aa187f36bef4d --- ReleaseNotes/ReleaseNotes-2.8.2.txt | 58 +++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/ReleaseNotes/ReleaseNotes-2.8.2.txt b/ReleaseNotes/ReleaseNotes-2.8.2.txt index 6d0f995641..0307b59d5d 100644 --- a/ReleaseNotes/ReleaseNotes-2.8.2.txt +++ b/ReleaseNotes/ReleaseNotes-2.8.2.txt @@ -36,6 +36,23 @@ that were set to a URL. If HEAD was detached the `GetHead` REST endpoint refused to resolve HEAD when the user was not a project owner. +* link:https://code.google.com/p/gerrit/issues/detail?id=2932[Issue 2932]: +Keep `status:closed` limit below MySQL Connector/J's hard limit. ++ +Since MySQL Connector/J 5.1.21 does not allow limits above 50M rows +and aborts them with 'setMaxRows() out of range', we cannot use `MAX_VALUE` +as limit for plain `status:closed` queries. + +* Fix IllegalArgumentException when running query with `limit:0` on secondary +index. ++ +Running a query with `limit:0` when the secondary index is enabled was causing +an internal server error. + +* Remove dependency on joda time library in gerrit launcher. ++ +The joda time library was being unnecessarily packaged in the root of +the gerrit.war file. Change Screen / Diff Screen --------------------------- @@ -65,6 +82,40 @@ the topic edit. + The action was using the cherry-pick button instead of the revert button. +* Improve the error message shown when cherry picking a change fails. ++ +The error message "Could not create merge commit during cherry pick" was +confusing for users, and is replaced with simply "Cherry pick failed". + +* Add newline on commit messages created by cherry picking a change in the UI +or via the REST API. ++ +If a commit was cherry-picked from the UI or via the REST API, the +trailing newline on the end of the commit message was lost. + +* link:https://code.google.com/p/gerrit/issues/detail?id=2405[Issue 2405]: +Update change to invalidate cache after deletion of draft revision. ++ +When a non-current draft patch set was deleted no update of the change +was made, causing the change screen to not work properly because it +relied on cached data. + +* Extend change screen's horizontal bars to full width. ++ +This allows the title of the change message to have some padding within +the bar. + +* Fix tab alignment to be correct width in side-by-side diff. ++ +This fixes the tab width to be the user's preference, rather than +1 + user's preference when show tabs is enabled. + +* Fill the browser width in side-by-side diff. ++ +Filling the browser available space with each side of the diff at +50% size allows the user to more easily view long lines if they +have a wide display, and better fit on more narrow displays by +splitting the available width at 50%. ssh --- @@ -93,6 +144,8 @@ without any arguments on a server running in slave mode. The `replication` command is provided by the replication plugin, so it is no longer relevant to mention this in the description of a core command. +* Fix aliasing of SSH commands. + Replication Plugin ------------------ @@ -118,6 +171,11 @@ differentiate between local and remote repository errors. * Update documentation to clarify replication of refs/meta/config when refspec is 'all refs'. +Upgrades +-------- + + +* JGit is upgraded to 3.2.0.201312181205-r Documentation -------------