githubFork/gitblit.git - Solinfo Gitblit

			@@ -110,6 +110,7 @@
			public void populateItem(final Item<RevCommit> item) {
			final RevCommit entry = item.getModelObject();
			final Date date = JGitUtils.getCommitDate(entry);
			final boolean isMerge = entry.getParentCount() > 1;

			item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils()));

			@@ -122,7 +123,7 @@
			item.add(authorLink);

			// merge icon
			if (entry.getParentCount() > 1) {
			if (isMerge) {
			item.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png"));
			} else {
			item.add(WicketUtils.newBlankImage("commitIcon"));
			@@ -136,7 +137,7 @@
			} else {
			trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG);
			}
			LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject",
			LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject" + (isMerge ? " merge" : ""),
			trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(
			repositoryName, entry.getName()));
			if (!shortMessage.equals(trimmedMessage)) {

			@@ -1712,6 +1712,14 @@
			color: white;
			}

			.merge {
			opacity: 0.5;
			}

			.merge:hover {
			opacity: 1;
			}

			td.author {
			font-style: italic !important;
			white-space: nowrap;
			@@ -1768,7 +1776,7 @@
			font-size: 9px;
			font-weight: normal;
			border: 1px solid;
			color: black;
			color: black;
			}

			.tagRef a, .headRef a, .localBranch a, .remoteBranch a, .otherRef a, .pullRef a {

	src/main/java/com/gitblit/wicket/panels/LogPanel.java	5 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/gitblit.css	10 ●●●●● patch \| view \| raw \| blame \| history