diff options
| author | Shawn Pearce <sop@google.com> | 2013-04-26 07:58:58 -0700 |
|---|---|---|
| committer | Shawn Pearce <sop@google.com> | 2013-04-26 07:58:58 -0700 |
| commit | aabdb82eb1dedda0cd82f731e3e2c925080daa3d (patch) | |
| tree | d3525c48f407e4b1b75a1d107cc46e3e04933462 /gerrit-httpd | |
| parent | ef8f30ac7bacb6f82007576f8177bfe135b2a563 (diff) | |
| parent | 64109d1976a65c0da68c828db7d3609f3887e88f (diff) | |
Merge branch 'stable-2.6'
* stable-2.6:
Sort library JARs by last modified time
Defer loading site libraries until database opens
Prevent account's full name from being set to empty string
Update 2.6 release notes with mod_rewrite change
Update 2.6 release notes with more trivial_rebase fixes
Vertically align the "Choose:" header on the Become Any Account page
Cannot Become Any Account for account whose full name is empty string
init: Default database type to JDBC when url is present
Remove old library JARs when upgrading
Diffstat (limited to 'gerrit-httpd')
2 files changed, 2 insertions, 2 deletions
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java index 932f8f0b4b..28e361cd4d 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java @@ -173,7 +173,7 @@ class BecomeAnyAccountLoginServlet extends HttpServlet { String displayName; if (a.getUserName() != null) { displayName = a.getUserName(); - } else if (a.getFullName() != null) { + } else if (a.getFullName() != null && !a.getFullName().isEmpty()) { displayName = a.getFullName(); } else if (a.getPreferredEmail() != null) { displayName = a.getPreferredEmail(); diff --git a/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/become/BecomeAnyAccount.html b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/become/BecomeAnyAccount.html index 3548b9af93..c660311820 100644 --- a/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/become/BecomeAnyAccount.html +++ b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/become/BecomeAnyAccount.html @@ -68,7 +68,7 @@ </tr> <tr> - <th>Choose:</th> + <th style="vertical-align: top;">Choose:</th> <td id="userlist"/> </tr> </table> |