Merge branch 'stable-2.10'

* stable-2.10:
  Set 'line-height: normal' for lines in side-by-side diff
  Add missing documentation of the groups_members cache
  SideBySide2: Show file name in window title again
  Fix documentation of the default value for core.streamFileThreshold
  Bump version to 2.9.2

Change-Id: Ibea6f3291015f1dc707057537916e00d5a93c501
This commit is contained in:
David Pursehouse 2014-11-19 19:15:10 +09:00
commit 30c35c8398
3 changed files with 8 additions and 2 deletions

View File

@ -621,6 +621,11 @@ cache `"groups_byinclude"`::
Caches group inclusions in other groups. If direct updates are made
to the `account_group_includes` table, this cache should be flushed.
cache `"groups_members"`::
+
Caches subgroups. If direct updates are made to the
`account_group_includes` table, this cache should be flushed.
cache `"ldap_groups"`::
+
Caches the LDAP groups that a user belongs to, if LDAP has been
@ -1066,8 +1071,7 @@ Setting this too high may cause the JVM to run out of heap space
when handling very big binary files, such as device firmware or
CD-ROM ISO images.
+
Default is 50 MiB on all platforms. Prior to Gerrit 2.1.6,
this value was effectively 2047 MiB.
Defaults to 25% of the available JVM heap, limited to 2048m.
+
Common unit suffixes of 'k', 'm', or 'g' are supported.

View File

@ -44,6 +44,7 @@ limitations under the License.
overflow: hidden;
border-right: 0;
width: auto;
line-height: normal;
}
/* Preserve space for underscores. If this changes

View File

@ -162,6 +162,7 @@ public class SideBySide2 extends Screen {
protected void onInitUI() {
super.onInitUI();
setHeaderVisible(false);
setWindowTitle(FileInfo.getFileName(path));
}
@Override