diff --git a/Documentation/config-accounts.txt b/Documentation/config-accounts.txt index e64242535d..4f4685b1f2 100644 --- a/Documentation/config-accounts.txt +++ b/Documentation/config-accounts.txt @@ -185,8 +185,6 @@ link:intro-user.html#preferences[general], link:user-review-ui.html#diff-preferences[diff] and edit preferences: ---- -[general] - showSiteHeader = false [diff] hideTopMenu = true [edit] diff --git a/Documentation/rest-api-accounts.txt b/Documentation/rest-api-accounts.txt index 5e39fcb734..06ae76efe6 100644 --- a/Documentation/rest-api-accounts.txt +++ b/Documentation/rest-api-accounts.txt @@ -1250,7 +1250,6 @@ any account. )]}' { "changes_per_page": 25, - "show_site_header": true, "download_command": "CHECKOUT", "date_format": "STD", "time_format": "HHMM_12", @@ -1305,7 +1304,6 @@ link:#preferences-input[PreferencesInput] entity. { "changes_per_page": 50, - "show_site_header": true, "expand_inline_diffs": true, "download_command": "CHECKOUT", "date_format": "STD", @@ -1355,7 +1353,6 @@ link:#preferences-info[PreferencesInfo] entity. )]}' { "changes_per_page": 50, - "show_site_header": true, "expand_inline_diffs": true, "download_command": "CHECKOUT", "date_format": "STD", @@ -2719,8 +2716,6 @@ The `PreferencesInfo` entity contains information about a user's preferences. |`changes_per_page` || The number of changes to show on each page. Allowed values are `10`, `25`, `50`, `100`. -|`show_site_header` |not set if `false`| -Whether the site header should be shown. |`expand_inline_diffs` |not set if `false`| Whether to expand diffs inline instead of opening as separate page (PolyGerrit only). @@ -2791,8 +2786,6 @@ user preferences. Fields which are not set will not be updated. |`changes_per_page` |optional| The number of changes to show on each page. Allowed values are `10`, `25`, `50`, `100`. -|`show_site_header` |optional| -Whether the site header should be shown. |`expand_inline_diffs` |not set if `false`| Whether to expand diffs inline instead of opening as separate page (PolyGerrit only). diff --git a/Documentation/rest-api-config.txt b/Documentation/rest-api-config.txt index c017e6c651..63b37e1d0b 100644 --- a/Documentation/rest-api-config.txt +++ b/Documentation/rest-api-config.txt @@ -1054,7 +1054,6 @@ PreferencesInfo] is returned. )]}' { "changes_per_page": 25, - "show_site_header": true, "download_command": "CHECKOUT", "date_format": "STD", "time_format": "HHMM_12", @@ -1132,7 +1131,6 @@ PreferencesInfo] is returned. )]}' { "changes_per_page": 50, - "show_site_header": true, "download_command": "CHECKOUT", "date_format": "STD", "time_format": "HHMM_12", diff --git a/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java b/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java index 9ebf8deee3..22aabd5911 100644 --- a/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java +++ b/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java @@ -131,8 +131,6 @@ public class GeneralPreferencesInfo { /** Number of changes to show in a screen. */ public Integer changesPerPage; - /** Should the site header be displayed when logged in ? */ - public Boolean showSiteHeader; /** Type of download URL the user prefers to use. */ public String downloadScheme; /** Type of download command the user prefers to use. */ @@ -207,7 +205,6 @@ public class GeneralPreferencesInfo { public static GeneralPreferencesInfo defaults() { GeneralPreferencesInfo p = new GeneralPreferencesInfo(); p.changesPerPage = DEFAULT_PAGESIZE; - p.showSiteHeader = true; p.downloadScheme = null; p.downloadCommand = DownloadCommand.CHECKOUT; p.dateFormat = DateFormat.STD; diff --git a/java/com/google/gerrit/server/account/Preferences.java b/java/com/google/gerrit/server/account/Preferences.java index f33d8fe3db..cdf47cc187 100644 --- a/java/com/google/gerrit/server/account/Preferences.java +++ b/java/com/google/gerrit/server/account/Preferences.java @@ -65,8 +65,6 @@ import org.eclipse.jgit.lib.Repository; *

The config file has separate sections for general, diff and edit preferences: * *

- *   [general]
- *     showSiteHeader = false
  *   [diff]
  *     hideTopMenu = true
  *   [edit]
diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/GeneralPreferencesIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/GeneralPreferencesIT.java
index 427233d9b4..1a8d4cd764 100644
--- a/javatests/com/google/gerrit/acceptance/api/accounts/GeneralPreferencesIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/accounts/GeneralPreferencesIT.java
@@ -73,7 +73,6 @@ public class GeneralPreferencesIT extends AbstractDaemonTest {
 
     // change all default values
     i.changesPerPage *= -1;
-    i.showSiteHeader ^= true;
     i.downloadCommand = DownloadCommand.REPO_DOWNLOAD;
     i.dateFormat = DateFormat.US;
     i.timeFormat = TimeFormat.HHMM_24;