Merge "Fix displaying of the branch-network"
diff --git a/pom.xml b/pom.xml
index 9c32190..44198d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<Gerrit-ApiType>plugin</Gerrit-ApiType>
- <Gerrit-ApiVersion>2.8-SNAPSHOT</Gerrit-ApiVersion>
+ <Gerrit-ApiVersion>2.9-SNAPSHOT</Gerrit-ApiVersion>
<Gerrit-ReloadMode>reload</Gerrit-ReloadMode>
<Gerrit-Module>com.googlesource.gerrit.plugins.branchnetwork.GitCommitCacheModule</Gerrit-Module>
<Gerrit-HttpModule>com.googlesource.gerrit.plugins.branchnetwork.NetworkGraphModule</Gerrit-HttpModule>
@@ -63,6 +63,7 @@
<configuration>
<archive>
<manifestEntries>
+ <Gerrit-PluginName>branch-network</Gerrit-PluginName>
<Gerrit-Module>${Gerrit-Module}</Gerrit-Module>
<Gerrit-HttpModule>${Gerrit-HttpModule}</Gerrit-HttpModule>
<Implementation-Vendor>GerritForge LLP</Implementation-Vendor>
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md
index c14d1e9..e6cacce 100644
--- a/src/main/resources/Documentation/config.md
+++ b/src/main/resources/Documentation/config.md
@@ -5,15 +5,21 @@
--------------------
In order to use branch-network plugin as GitWeb project viewer replacement
-simply add the following line to your existing Gerrit config under the
-GitWeb section (assuming plugin was copied as branch-network.jar):
+simply add the following lines to your existing Gerrit config under the
+GitWeb section (assuming the plugin was copied as branch-network.jar):
```
type = custom
- url = plugins/
- project = branch-network/?p=${project}
+ url = plugins/branch-network/
+ project = ?p=${project}
+ branch = ?p=${project}
+ revision = ?p=${project}
+ filehistory = ?p=${project}
```
+Note that the `project, ``branch`, `revision` and `filehistory` settings
+must all be specified, otherwise Gerrit will disable the configuration.
+
Usage in other GWT or JavaScript UI
-----------------------------------
@@ -42,7 +48,6 @@
-------
The following URL allows to get a 1024x768 HTML5 Canvas in a naked HTML fragment.
-(assuming plugin was copied as branch-network.jar)
```
branch-network/?p=${project}&naked=y&width=1024&height=768