diff --git a/app/views/git/create.scala.html b/app/views/git/create.scala.html index 3e7fe83b6..02fc4d4d6 100644 --- a/app/views/git/create.scala.html +++ b/app/views/git/create.scala.html @@ -82,6 +82,7 @@ +
@Messages("pullRequest.is.merging")
@@ -131,7 +132,8 @@ "fromProject" : $("#fromProjectId"), "toProject" : $("#toProjectId"), "fromBranch" : $("#fromBranch"), - "toBranch" : $("#toBranch") + "toBranch" : $("#toBranch"), + "state" : $("#pullRequestState").data("value") }); // yobi.Mention diff --git a/app/views/git/edit.scala.html b/app/views/git/edit.scala.html index eddb45f76..f92a5ace0 100644 --- a/app/views/git/edit.scala.html +++ b/app/views/git/edit.scala.html @@ -81,9 +81,12 @@ -
- @Messages("pullRequest.is.merging") -
+ + @if(pullRequest.isOpen) { +
+ @Messages("pullRequest.is.merging") +
+ }