diff options
| author | James Moger <james.moger@gitblit.com> | 2014-12-03 13:58:19 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-12-03 13:58:19 -0600 |
| commit | 713f30551c3b5b2d99a023d48a930475e1002c21 (patch) | |
| tree | 332f88787ff67d6c2a44f23cc4bbc961326dfae1 /src | |
| parent | afb98a26157f9aa132d4beb0e743519f53e97104 (diff) | |
| parent | d316f8749213af7f25610ce6a7b8cb1391218fde (diff) | |
| download | gitblit-713f30551c3b5b2d99a023d48a930475e1002c21.tar.gz gitblit-713f30551c3b5b2d99a023d48a930475e1002c21.zip | |
Merged #227 "Small adjustments to allow integration with Gerrit Code Review"
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/gitblit/servlet/GitblitContext.java | 10 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/LogoutPage.html | 2 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/RootPage.html | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java index fa0534db..077624c2 100644 --- a/src/main/java/com/gitblit/servlet/GitblitContext.java +++ b/src/main/java/com/gitblit/servlet/GitblitContext.java @@ -261,9 +261,13 @@ public class GitblitContext extends GuiceServletContextListener { protected <X extends IManager> X startManager(Injector injector, Class<X> clazz) { X x = loadManager(injector, clazz); logManager(clazz); - x.start(); - managers.add(x); - return x; + return startManager(x); + } + + protected <X extends IManager> X startManager(X x) { + x.start(); + managers.add(x); + return x; } protected void logManager(Class<? extends IManager> clazz) { diff --git a/src/main/java/com/gitblit/wicket/pages/LogoutPage.html b/src/main/java/com/gitblit/wicket/pages/LogoutPage.html index d4077830..ab3c0dae 100644 --- a/src/main/java/com/gitblit/wicket/pages/LogoutPage.html +++ b/src/main/java/com/gitblit/wicket/pages/LogoutPage.html @@ -14,7 +14,7 @@ <span class="icon-bar"></span> </a> <a class="brand" wicket:id="rootLink"> - <img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/> + <img src="gitblt_25_white.png" width="79" alt="gitblit" class="logo"/> </a> </div> diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.html b/src/main/java/com/gitblit/wicket/pages/RootPage.html index 2ff305f2..c51db819 100644 --- a/src/main/java/com/gitblit/wicket/pages/RootPage.html +++ b/src/main/java/com/gitblit/wicket/pages/RootPage.html @@ -14,7 +14,7 @@ <span class="icon-bar"></span>
</a>
<a class="brand" wicket:id="rootLink">
- <img src="logo.png" height="45" width="120" class="logo"/>
+ <img src="logo.png" width="120" class="logo"/>
</a>
<div class="nav-collapse">
|