Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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

@@ -35,6 +35,7 @@
import com.gitblit.models.GitNote;

import com.gitblit.models.PathModel.PathChangeModel;

import com.gitblit.models.SubmoduleModel;

import com.gitblit.servlet.RawServlet;

import com.gitblit.utils.JGitUtils;

import com.gitblit.wicket.CacheControl;

import com.gitblit.wicket.CacheControl.LastModified;

@@ -43,7 +44,7 @@
import com.gitblit.wicket.panels.CommitLegendPanel;

import com.gitblit.wicket.panels.CompressedDownloadsPanel;

import com.gitblit.wicket.panels.DiffStatPanel;

import com.gitblit.wicket.panels.GravatarImage;

import com.gitblit.wicket.panels.AvatarImage;

import com.gitblit.wicket.panels.LinkPanel;

import com.gitblit.wicket.panels.RefsPanel;



@@ -132,7 +133,7 @@
            item.add(new RefsPanel("refName", repositoryName, Arrays.asList(entry.notesRef)));

            item.add(createPersonPanel("authorName", entry.notesRef.getAuthorIdent(),

                  Constants.SearchType.AUTHOR));

            item.add(new GravatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));

            item.add(new AvatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));

            item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef

                  .getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils()));

            item.add(new Label("noteContent", bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName,

@@ -222,8 +223,8 @@
               item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils

                     .newPathParameter(repositoryName, entry.commitId, entry.path))

                     .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));

               item.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils

                     .newPathParameter(repositoryName, entry.commitId, entry.path))

               String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, entry.commitId, entry.path);

               item.add(new ExternalLink("raw", rawUrl)

                     .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));

               item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils

                     .newPathParameter(repositoryName, entry.commitId, entry.path))

@@ -247,6 +248,11 @@
   }



   @Override

   protected boolean isCommitPage() {

      return true;

   }



   @Override

   protected Class<? extends BasePage> getRepoNavPageClass() {

      return LogPage.class;

   }