From 114188ad2f8259b00b59a1bc9567b0a0b28771bf Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Mon, 24 Mar 2014 23:26:14 +0100 Subject: [PATCH 1/3] Hide abandoned changes from Cherry Picks Panel on new change screen Change-Id: I90bef3d1335474ae35acbbb4429c92757c766adc Signed-off-by: Edwin Kempin --- .../java/com/google/gerrit/client/change/RelatedChanges.java | 1 + 1 file changed, 1 insertion(+) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java index ab90eba06e..1690d5c7bc 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java @@ -178,6 +178,7 @@ public class RelatedChanges extends TabPanel { cherryPicksQuery.append(op("project", info.project())); cherryPicksQuery.append(" ").append(op("change", info.change_id())); cherryPicksQuery.append(" ").append(op("-change", info.legacy_id().get())); + cherryPicksQuery.append(" -is:abandoned"); ChangeList.query(cherryPicksQuery.toString(), EnumSet.of(ListChangesOption.CURRENT_REVISION, ListChangesOption.CURRENT_COMMIT), new TabChangeListCallback(Tab.CHERRY_PICKS, info.project(), revision)); From ca875863529fe3d99fab44331c32de9f35625306 Mon Sep 17 00:00:00 2001 From: Fredrik Luthander Date: Mon, 17 Mar 2014 01:07:58 +0100 Subject: [PATCH 2/3] Documentation: Format fix headlines Change-Id: Ie31c14b3fbd5f3363c78fd6dbbaa535c80e2a014 Signed-off-by: Fredrik Luthander --- Documentation/cmd-kill.txt | 3 +-- Documentation/cmd-ls-members.txt | 3 +-- Documentation/user-signedoffby.txt | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Documentation/cmd-kill.txt b/Documentation/cmd-kill.txt index c64c537165..c014b3f81f 100644 --- a/Documentation/cmd-kill.txt +++ b/Documentation/cmd-kill.txt @@ -20,8 +20,7 @@ or have been granted link:access-control.html#capability_kill[the 'Kill Task' gl == SCRIPTING Intended for interactive use only. -GERRIT ------- +== GERRIT Part of link:index.html[Gerrit Code Review] SEARCHBOX diff --git a/Documentation/cmd-ls-members.txt b/Documentation/cmd-ls-members.txt index 7e1a087bd2..f8708d3f53 100644 --- a/Documentation/cmd-ls-members.txt +++ b/Documentation/cmd-ls-members.txt @@ -1,5 +1,4 @@ -gerrit ls-members -================ += gerrit ls-members == NAME gerrit ls-members - Show members of a given group diff --git a/Documentation/user-signedoffby.txt b/Documentation/user-signedoffby.txt index 48e83dab0f..d9e2829993 100644 --- a/Documentation/user-signedoffby.txt +++ b/Documentation/user-signedoffby.txt @@ -1,5 +1,4 @@ -Gerrit Code Review - Signed-off-by Lines -========================================= += Gerrit Code Review - Signed-off-by Lines [NOTE] This document was literally taken from link:http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Documentation/SubmittingPatches;hb=4e8a2372f9255a1464ef488ed925455f53fbdaa1[linux-2.6 Documentation/SubmittingPatches] @@ -169,8 +168,7 @@ done on the patch. Reviewed-by: tags, when supplied by reviewers known to understand the subject area and to perform thorough reviews, will normally increase the likelihood of your patch getting into the kernel. -GERRIT ------- +== GERRIT Part of link:index.html[Gerrit Code Review] SEARCHBOX From a6bb9515a7e9364e2c0e5acab9bb84ec5228b9c5 Mon Sep 17 00:00:00 2001 From: Fredrik Luthander Date: Mon, 24 Mar 2014 18:59:45 -0700 Subject: [PATCH 3/3] Documentation: Case consistencies for SEE ALSO Change-Id: Ib40324ba94d0278dc6923092163d3ccc6d9df8fb Signed-off-by: Fredrik Luthander --- Documentation/config-gitweb.txt | 2 +- Documentation/config-hooks.txt | 2 +- Documentation/config-mail.txt | 2 +- Documentation/pgm-LocalUsernamesToLowerCase.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/config-gitweb.txt b/Documentation/config-gitweb.txt index 92260d46b2..fb7c961f56 100644 --- a/Documentation/config-gitweb.txt +++ b/Documentation/config-gitweb.txt @@ -265,7 +265,7 @@ cgit can be used by specifying `gitweb.type` to be 'cgit'. It is also possible to define custom patterns. -=== See Also +=== SEE ALSO * link:config-gerrit.html#gitweb[Section gitweb] * link:http://hjemli.net/git/cgit/[cgit] diff --git a/Documentation/config-hooks.txt b/Documentation/config-hooks.txt index 4aadb15a23..0f4d0945cb 100644 --- a/Documentation/config-hooks.txt +++ b/Documentation/config-hooks.txt @@ -145,7 +145,7 @@ passed to all hooks. Hooks started out of an SSH context (for example the patchset-created hook) don't know the server's web URL, unless this variable is configured. -== See Also +== SEE ALSO * link:config-gerrit.html#hooks[Section hooks] diff --git a/Documentation/config-mail.txt b/Documentation/config-mail.txt index 247784323a..62d0219116 100644 --- a/Documentation/config-mail.txt +++ b/Documentation/config-mail.txt @@ -176,7 +176,7 @@ $patchSetInfo:: A reference to the current `PatchSetInfo`. -== See Also +== SEE ALSO * link:http://velocity.apache.org/[velocity] diff --git a/Documentation/pgm-LocalUsernamesToLowerCase.txt b/Documentation/pgm-LocalUsernamesToLowerCase.txt index cf7c80129d..c4a0f05aa8 100644 --- a/Documentation/pgm-LocalUsernamesToLowerCase.txt +++ b/Documentation/pgm-LocalUsernamesToLowerCase.txt @@ -52,7 +52,7 @@ To convert the local username of every account to lower case: $ java -jar gerrit.war LocalUsernamesToLowerCase -d site_path ==== -== See Also +== SEE ALSO * Configuration parameter link:config-gerrit.html#ldap.localUsernameToLowerCase[ldap.localUsernameToLowerCase]