diff --git a/Documentation/intro-user.txt b/Documentation/intro-user.txt index 17c9a6113c..e9f186136b 100644 --- a/Documentation/intro-user.txt +++ b/Documentation/intro-user.txt @@ -694,36 +694,6 @@ The user's preferences are stored in a `git config` style file named The following preferences can be configured: -- [[review-category]]`Display In Review Category`: -+ -This setting controls how the values of the review labels in change -lists and dashboards are visualized. -+ -** `None`: -+ -For each review label only the voting value is shown. Approvals are -rendered as a green check mark icon, vetoes as a red X icon. -+ -** `Show Name`: -+ -For each review label the voting value is shown together with the full -name of the voting user. -+ -** `Show Email`: -+ -For each review label the voting value is shown together with the email -address of the voting user. -+ -** `Show Username`: -+ -For each review label the voting value is shown together with the -username of the voting user. -+ -** `Show Abbreviated Name`: -+ -For each review label the voting value is shown together with the -initials of the full name of the voting user. - - [[page-size]]`Maximum Page Size`: + The maximum number of entries that are shown on one page, e.g. used diff --git a/Documentation/rest-api-accounts.txt b/Documentation/rest-api-accounts.txt index 5d22659aa3..b02e1da79d 100644 --- a/Documentation/rest-api-accounts.txt +++ b/Documentation/rest-api-accounts.txt @@ -1257,7 +1257,6 @@ any account. "time_format": "HHMM_12", "diff_view": "SIDE_BY_SIDE", "size_bar_in_change_table": true, - "review_category_strategy": "ABBREV", "mute_common_path_prefixes": true, "publish_comments_on_push": true, "work_in_progress_by_default": true, @@ -1313,7 +1312,6 @@ link:#preferences-input[PreferencesInput] entity. "date_format": "STD", "time_format": "HHMM_12", "size_bar_in_change_table": true, - "review_category_strategy": "NAME", "diff_view": "SIDE_BY_SIDE", "mute_common_path_prefixes": true, "my": [ @@ -1364,7 +1362,6 @@ link:#preferences-info[PreferencesInfo] entity. "date_format": "STD", "time_format": "HHMM_12", "size_bar_in_change_table": true, - "review_category_strategy": "NAME", "diff_view": "SIDE_BY_SIDE", "publish_comments_on_push": true, "work_in_progress_by_default": true, @@ -2750,9 +2747,6 @@ Allowed values are `SIDE_BY_SIDE`, `UNIFIED_DIFF`. Whether to show the change sizes as colored bars in the change table. |`legacycid_in_change_table` |not set if `false`| Whether to show change number in the change table. -|`review_category_strategy` || -The strategy used to displayed info in the review category column. -Allowed values are `NONE`, `NAME`, `EMAIL`, `USERNAME`, `ABBREV`. |`mute_common_path_prefixes` |not set if `false`| Whether to mute common path prefixes in file names in the file table. |`signed_off_by` |not set if `false`| @@ -2822,9 +2816,6 @@ Allowed values are `SIDE_BY_SIDE`, `UNIFIED_DIFF`. Whether to show the change sizes as colored bars in the change table. |`legacycid_in_change_table` |optional| Whether to show change number in the change table. -|`review_category_strategy` |optional| -The strategy used to displayed info in the review category column. -Allowed values are `NONE`, `NAME`, `EMAIL`, `USERNAME`, `ABBREV`. |`mute_common_path_prefixes` |optional| Whether to mute common path prefixes in file names in the file table. |`signed_off_by` |optional| diff --git a/Documentation/rest-api-config.txt b/Documentation/rest-api-config.txt index 96b376d2ac..bf99709164 100644 --- a/Documentation/rest-api-config.txt +++ b/Documentation/rest-api-config.txt @@ -1061,7 +1061,6 @@ PreferencesInfo] is returned. "time_format": "HHMM_12", "diff_view": "SIDE_BY_SIDE", "size_bar_in_change_table": true, - "review_category_strategy": "NONE", "mute_common_path_prefixes": true, "publish_comments_on_push": true, "my": [ @@ -1140,7 +1139,6 @@ PreferencesInfo] is returned. "time_format": "HHMM_12", "diff_view": "SIDE_BY_SIDE", "size_bar_in_change_table": true, - "review_category_strategy": "NONE", "mute_common_path_prefixes": true, "publish_comments_on_push": true, "my": [ diff --git a/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java b/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java index fa95b8fada..afea837d7a 100644 --- a/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java +++ b/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java @@ -68,14 +68,6 @@ public class GeneralPreferencesInfo { } } - public enum ReviewCategoryStrategy { - NONE, - NAME, - EMAIL, - USERNAME, - ABBREV - } - public enum DiffView { SIDE_BY_SIDE, UNIFIED_DIFF @@ -148,7 +140,6 @@ public class GeneralPreferencesInfo { public DiffView diffView; public Boolean sizeBarInChangeTable; public Boolean legacycidInChangeTable; - public ReviewCategoryStrategy reviewCategoryStrategy; public Boolean muteCommonPathPrefixes; public Boolean signedOffBy; public EmailStrategy emailStrategy; @@ -160,10 +151,6 @@ public class GeneralPreferencesInfo { public List changeTable; public Map urlAliases; - public boolean isShowInfoInReviewCategory() { - return getReviewCategoryStrategy() != ReviewCategoryStrategy.NONE; - } - public DateFormat getDateFormat() { if (dateFormat == null) { return DateFormat.STD; @@ -178,13 +165,6 @@ public class GeneralPreferencesInfo { return timeFormat; } - public ReviewCategoryStrategy getReviewCategoryStrategy() { - if (reviewCategoryStrategy == null) { - return ReviewCategoryStrategy.NONE; - } - return reviewCategoryStrategy; - } - public DiffView getDiffView() { if (diffView == null) { return DiffView.SIDE_BY_SIDE; @@ -221,7 +201,6 @@ public class GeneralPreferencesInfo { p.diffView = DiffView.SIDE_BY_SIDE; p.sizeBarInChangeTable = true; p.legacycidInChangeTable = false; - p.reviewCategoryStrategy = ReviewCategoryStrategy.NONE; p.muteCommonPathPrefixes = true; p.signedOffBy = false; p.emailStrategy = EmailStrategy.ENABLED; diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/GeneralPreferencesIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/GeneralPreferencesIT.java index 12266c9ceb..d5949ddd57 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/GeneralPreferencesIT.java +++ b/javatests/com/google/gerrit/acceptance/api/accounts/GeneralPreferencesIT.java @@ -28,7 +28,6 @@ import com.google.gerrit.extensions.client.GeneralPreferencesInfo.DiffView; import com.google.gerrit.extensions.client.GeneralPreferencesInfo.DownloadCommand; import com.google.gerrit.extensions.client.GeneralPreferencesInfo.EmailFormat; import com.google.gerrit.extensions.client.GeneralPreferencesInfo.EmailStrategy; -import com.google.gerrit.extensions.client.GeneralPreferencesInfo.ReviewCategoryStrategy; import com.google.gerrit.extensions.client.GeneralPreferencesInfo.TimeFormat; import com.google.gerrit.extensions.client.MenuItem; import com.google.gerrit.extensions.config.DownloadScheme; @@ -88,7 +87,6 @@ public class GeneralPreferencesIT extends AbstractDaemonTest { i.legacycidInChangeTable ^= true; i.muteCommonPathPrefixes ^= true; i.signedOffBy ^= true; - i.reviewCategoryStrategy = ReviewCategoryStrategy.ABBREV; i.diffView = DiffView.UNIFIED_DIFF; i.my = new ArrayList<>(); i.my.add(new MenuItem("name", "url"));