Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>0.10.1</version>
<version>3.3.1.201403241930-r</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
Expand All @@ -65,6 +65,12 @@
<version>3.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.atlassian.velocity.htmlsafe</groupId>
<artifactId>velocity-htmlsafe</artifactId>
<version>1.2.1-m2</version>
<scope>provided</scope>
</dependency>
<!--
<dependency>
<groupId>opensymphony</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/RepoTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public static void main(String[] args) throws Exception {
}

Repository repository = builder.build();
System.out.println(repository.getObjectsDirectory().exists());
System.out.println(repository.getObjectDatabase().exists());

repository.scanForRepoChanges();
for(Map.Entry<String, Ref> pair : repository.getAllRefs().entrySet()) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xiplink/jira/git/GitManagerImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ public void activate() {
return;
}

if (!repository.getObjectsDirectory().exists()) {
if (!repository.getObjectDatabase().exists()) {
log.error("Connection to git repository " + getRoot() + " failed: Invalid repository");
// We don't want to throw an exception here because then the system
// won't start if the repo is down or there is something wrong
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.util.Map;
import java.util.Set;

import com.atlassian.velocity.htmlsafe.HtmlSafe;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.revwalk.RevCommit;
Expand Down Expand Up @@ -93,6 +94,7 @@ public FileDiff[] getChangedPaths() {
return multipleGitRepositoryManager.getRepository(repoId).getFileDiffs(revision.getId().name());
}

@HtmlSafe
public String getLinkedLogMessageHtml() {
// Name ends in Html to avoid HTML escaping
// https://developer.atlassian.com/display/JIRADEV/Velocity+Templates
Expand Down