Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  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

Conflicts:
	VERSION
	gerrit-extension-api/pom.xml
	gerrit-plugin-api/pom.xml
	gerrit-plugin-archetype/pom.xml
	gerrit-plugin-gwt-archetype/pom.xml
	gerrit-plugin-gwtui/pom.xml
	gerrit-plugin-js-archetype/pom.xml
	gerrit-war/pom.xml

Change-Id: Ie294e17f71d3df1ec3d52300e22ea5e83834f73f
This commit is contained in:
David Pursehouse
2014-11-19 18:50:34 +09:00
3 changed files with 8 additions and 2 deletions

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

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