diff --git a/src/main/twirl/issues/commentlist.scala.html b/src/main/twirl/issues/commentlist.scala.html index 3460585..edcd8a2 100644 --- a/src/main/twirl/issues/commentlist.scala.html +++ b/src/main/twirl/issues/commentlist.scala.html @@ -36,11 +36,11 @@
@pullreq.map(_.commitIdTo.substring(0, 7))
+ @user(comment.commentedUserName, styleClass="username strong") merged commit @pullreq.map(_.commitIdTo.substring(0, 7))
into
@if(pullreq.get.requestUserName == repository.owner){
- @pullreq.map(_.requestBranch) to @pullreq.map(_.branch)
+ @pullreq.map(_.branch) from @pullreq.map(_.requestBranch)
} else {
- @pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch) to @pullreq.map(_.userName):@pullreq.map(_.branch)
+ @pullreq.map(_.userName):@pullreq.map(_.branch) to @pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch)
}
@datetime(comment.registeredDate)
@pullreq.requestUserName:@pullreq.requestBranch
from @pullreq.userName:@pullreq.branch
+ into @pullreq.userName:@pullreq.branch
from @pullreq.requestUserName:@pullreq.requestBranch
at @datetime(comment.registeredDate)
}.getOrElse {
Closed
@user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
- into @pullreq.requestUserName:@pullreq.requestBranch
from @pullreq.userName:@pullreq.branch
+ into @pullreq.userName:@pullreq.branch
from @pullreq.requestUserName:@pullreq.requestBranch
}
} else {
Open
@user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
- into @pullreq.requestUserName:@pullreq.requestBranch
from @pullreq.userName:@pullreq.branch
+ into @pullreq.userName:@pullreq.branch
from @pullreq.requestUserName:@pullreq.requestBranch
}