Merged #227 "Small adjustments to allow integration with Gerrit Code Review"

James Moger

2014-12-03 713f30551c3b5b2d99a023d48a930475e1002c21

Merged #227 "Small adjustments to allow integration with Gerrit Code Review"

 src/main/java/com/gitblit/servlet/GitblitContext.java

@@ -261,9 +261,13 @@
    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) {

 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>

 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">