diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2013-10-16 15:18:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-16 15:18:31 +0000 |
| commit | d79c63ba13ada73fad01f23f73f97970c2b7741f (patch) | |
| tree | 8387f4d8a45631e62bae494c1755dc08495fcda0 | |
| parent | a3cf3548a808d9d856af31eaf10a9092482782ce (diff) | |
| parent | 4a00e22d70a63988d3b891431dc22f9cacbf0fae (diff) | |
Merge "Fix inclusion of username if detailed account information is requested"
| -rw-r--r-- | Documentation/rest-api-changes.txt | 4 | ||||
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfo.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt index 08411f5111..9b83a6fb7a 100644 --- a/Documentation/rest-api-changes.txt +++ b/Documentation/rest-api-changes.txt @@ -209,8 +209,8 @@ default. Optional fields are: [[detailed-accounts]] -- -* `DETAILED_ACCOUNTS`: include `_account_id` and `email` fields when - referencing accounts. +* `DETAILED_ACCOUNTS`: include `_account_id`, `email` and `username` + fields when referencing accounts. -- [[messages]] diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfo.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfo.java index cde59e1124..7498002cfd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfo.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfo.java @@ -38,6 +38,7 @@ public class AccountInfo { Collections.unmodifiableSet(EnumSet.of( FillOptions.NAME, FillOptions.EMAIL, + FillOptions.USERNAME, FillOptions.AVATARS)); public interface Factory { |