Merge pull request #921 from paulsputer/git-lfs-support

James Moger

2015-10-10 a3a18a0ebfeb65777ad5bd065e26fa9c00e8100c

 src/main/java/com/gitblit/wicket/pages/RootPage.java

@@ -40,7 +40,6 @@
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -71,6 +70,7 @@
import com.gitblit.utils.ModelUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.NonTrimmedPasswordTextField;
import com.gitblit.wicket.SessionlessForm;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.AvatarImage;
@@ -191,6 +191,7 @@
         }
         navLinks.add(new PageNavLink("gb.repositories", RepositoriesPage.class,
               getRootPageParameters()));
         navLinks.add(new PageNavLink("gb.filestore", FilestorePage.class, getRootPageParameters()));
         navLinks.add(new PageNavLink("gb.activity", ActivityPage.class, getRootPageParameters()));
         if (allowLucene) {
            navLinks.add(new PageNavLink("gb.search", LuceneSearchPage.class));
@@ -279,7 +280,7 @@

         request = ((WebRequest) getRequest()).getHttpServletRequest();
         response = ((WebResponse) getResponse()).getHttpServletResponse();
         request.getSession().setAttribute(Constants.AUTHENTICATION_TYPE, AuthenticationType.CREDENTIALS);
         request.getSession().setAttribute(Constants.ATTRIB_AUTHTYPE, AuthenticationType.CREDENTIALS);

         // Set Cookie
         app().authentication().setCookie(request, response, user);
@@ -581,7 +582,7 @@
         TextField<String> unameField = new TextField<String>("username", username);
         WicketUtils.setInputPlaceholder(unameField, markupProvider.getString("gb.username"));
         loginForm.add(unameField);
         PasswordTextField pwField = new PasswordTextField("password", password);
         NonTrimmedPasswordTextField pwField = new NonTrimmedPasswordTextField("password", password);
         WicketUtils.setInputPlaceholder(pwField, markupProvider.getString("gb.password"));
         loginForm.add(pwField);
         add(loginForm);
@@ -608,8 +609,8 @@
         UserModel user = session.getUser();
         boolean editCredentials = app().authentication().supportsCredentialChanges(user);
         HttpServletRequest request = ((WebRequest) getRequest()).getHttpServletRequest();
         AuthenticationType authenticationType = (AuthenticationType) request.getSession().getAttribute(Constants.AUTHENTICATION_TYPE);
         boolean standardLogin = authenticationType.isStandard();
         AuthenticationType authenticationType = (AuthenticationType) request.getAttribute(Constants.ATTRIB_AUTHTYPE);
         boolean standardLogin = (null != authenticationType) ? authenticationType.isStandard() : true;

         if (app().settings().getBoolean(Keys.web.allowGravatar, true)) {
            add(new AvatarImage("username", user, "navbarGravatar", 20, false));