[Notice] Announcing the End of Demo Server [Read me]
File name
Commit message
Commit date
File name
Commit message
Commit date
File name
Commit message
Commit date
2013-12-20
2014-03-11
File name
Commit message
Commit date
2014-02-13
@**
* Yobi, Project Hosting SW
*
* Copyright 2013 NAVER Corp.
* http://yobi.io
*
* @Author Keesun Baik, Wansoon Park
*
* 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, pull: PullRequest, canDeleteBranch: Boolean, canRestoreBranch: Boolean)
@import utils.JodaDateUtil._
@import utils.TemplateHelper._
@import utils.AccessControl._
@import models.enumeration
@import scala.collection.JavaConversions._
@branchName(branch:String) = @{
branch.replace("refs/heads/", "")
}
@getCodeURL(project: Project) = @{
if(session == null){
CodeApp.getURL(project.owner, project.name)
} else {
defining(ProjectUser.roleOf(session.get("loginId"), project)) { role =>
if(role == "manager" || role == "member"){
CodeApp.getURL(project.owner, project.name).replace("://", "://" + session.get("loginId") + "@")
} else {
CodeApp.getURL(project.owner, project.name)
}
}
}
}
@if(pull.isMerging == false && !pull.isClosed && !pull.isMerged){
@if(pull.isConflict == false){
<div class="alert alert-success">
<h5>@Messages("pullRequest.is.safe")</h5>
</div>
} else {
<div class="alert alert-error">
<h5>@Messages("pullRequest.is.not.safe")</h5>
<div>
<h5>@Messages("pullRequest.conflict.files")</h5>
<ul class="unstyled conflict-files">
@for(file <- pull.getConflictFiles) {
<li><i class="yobicon-file"></i> @file</li>
}
</ul>
</div>
@if(UserApp.currentUser().equals(pull.contributor)){
<div>
<h5>@Messages("pullRequest.resolve.conflict")</h5>
<ol>
<li>@Messages("pullRequest.resolver.step1") <code>git checkout @branchName(pull.fromBranch)</code></li>
<li>@Messages("pullRequest.resolver.step2") <code>git remote add upstream @getCodeURL(pull.toProject)</code></li>
<li>@Messages("pullRequest.resolver.step3") <code>git fetch upstream</code></li>
<li>@Messages("pullRequest.resolver.step4") <code>git rebase upstream/@branchName(pull.toBranch)</code></li>
<li>@Messages("pullRequest.resolver.step5") </li>
<li>@Messages("pullRequest.resolver.step6") <code>git add resolved_file</code></li>
<li>@Messages("pullRequest.resolver.step7") <code>git rebase --continue</code></li>
<li>@Messages("pullRequest.resolver.step8") </li>
<li>@Messages("pullRequest.resolver.step9") <code>git push -f origin @branchName(pull.fromBranch)</code></li>
<li>@Messages("pullRequest.resolver.step10") <a href="@routes.PullRequestApp.pullRequest(project.owner, project.name, pull.number)" class="ybtn ybtn-info ybtn-small">@Messages("button.page.refresh")</a>@Messages("pullRequest.resolver.step11")</li>
</ol>
</div>
}
</div>
}
}
@if(pull.isMerging == true){
<div class="alert alert-warnning">
<h5>@Messages("pullRequest.is.merging")</h5>
</div>
}
@if(pull.isMerged){
<div class="alert alert-info">
<a href="@routes.UserApp.userInfo(pull.receiver.loginId)" class="avatar-wrap small">
<img src="@pull.receiver.avatarUrl" width="25" height="25">
</a>
@Html(Messages("pullRequest.merged.the.pullrequest", pull.receiver.name, routes.UserApp.userInfo(pull.receiver.loginId)))
@if(UserApp.currentUser().equals(pull.contributor)) {
@if(canDeleteBranch) {
<code>@pull.fromBranch</code> @Messages("pullRequest.delete.frombranch.message")
<button class="ybtn ybtn-danger ybtn-mini pull-right" data-request-method="delete" data-request-uri="@routes.PullRequestApp.deleteFromBranch(project.owner, project.name, pull.number)">@Messages("pullRequest.delete.branch")</button>
}
@if(canRestoreBranch) {
<code>@pull.fromBranch</code> @Messages("pullRequest.restore.frombranch.message")
<a data-request-method="post" href="@routes.PullRequestApp.restoreFromBranch(project.owner, project.name, pull.number)" class="ybtn ybtn-info ybtn-mini pull-right">@Messages("pullRequest.restore.branch")</a>
}
}
</div>
}