@** * Yobi, Project Hosting SW * * Copyright 2014 NAVER Corp. * http://yobi.io * * @author Jihan Kim * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. **@ @(project: Project, pullRequest:models.PullRequest, commits: List[playRepository.GitCommit], conflict: Boolean) @import utils.JodaDateUtil @import utils.TemplateHelper._ @import utils.AccessControl._ @import models.enumeration @import playRepository.GitCommit @import scala.collection.Map @if(conflict != null) {
@if(commits.isEmpty) {
@Messages("pullRequest.diff.noChanges")
} else {
@for(commit <- commits){ }
@{"@"} @Messages("code.commitMsg") @Messages("code.commitDate") @Messages("code.author")
@commit.getShortId @defining(CommitComment.count(pullRequest.fromProject, commit.getId, null)){ numOfComment => @if(numOfComment > 0) { @numOfComment } } @defining(commit.getMessage){ commitMsg => @common.commitMsg(commitMsg.split("\n")(0), commitMsg, routes.CodeHistoryApp.show(pullRequest.fromProject.owner, pullRequest.fromProject.name, commit.getId).toString()) } @agoOrDateString(commit.getAuthorDate) @defining(User.find.where.eq("email", commit.getAuthorEmail).findUnique) { user => @if(user != null) { @user.name } else {
} }
}
}