From a9607ed7206ab24bbde4e062d42833816f0187a2 Mon Sep 17 00:00:00 2001
From: Konrad Langenberg <konrad@kola-entertainments.de>
Date: Tue, 29 Aug 2017 22:32:29 +0200
Subject: [PATCH] Implemented Dependencies for pull requests.

Signed-off-by: Konrad <konrad@kola-entertainments.de>
---
 routers/repo/issue.go                          |  9 +++++++--
 routers/repo/pull.go                           |  8 ++++++++
 templates/repo/issue/view_content/sidebar.tmpl | 16 ++++++++++++++--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index ff51b6aaa..d280717ab 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -874,8 +874,13 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) {
 				canbeClosed := models.IssueNoDependenciesLeft(issue.ID)
 
 				if !canbeClosed {
-					ctx.Flash.Error("You need to close all issues blocking this issue!")
-					ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index))
+					if issue.IsPull{
+						ctx.Flash.Error("You need to close all issues blocking this pull request before you can merge it!")
+						ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, issue.Index))
+					} else {
+						ctx.Flash.Error("You need to close all issues blocking this issue before you can close it!")
+						ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index))
+					}
 					return
 				}
 			}
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index ad4a01ec9..7b3296403 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -428,6 +428,14 @@ func MergePullRequest(ctx *context.Context) {
 
 	pr.Issue = issue
 	pr.Issue.Repo = ctx.Repo.Repository
+	canbeClosed := models.IssueNoDependenciesLeft(issue.ID)
+
+	if !canbeClosed {
+		ctx.Flash.Error("You need to close all issues blocking this pull request before you can merge it!")
+		ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
+		return
+	}
+
 	if err = pr.Merge(ctx.User, ctx.Repo.GitRepo); err != nil {
 		ctx.Handle(500, "Merge", err)
 		return
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 5daa83453..27f17c314 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -128,7 +128,13 @@
 			<span class="text"><strong>{{.i18n.Tr "repo.issues.dependency.title"}}</strong></span>
 			<br>
 			{{if .BlockedByDependencies}}
-			<span class="text">Closing this issue is blocked by:</span>
+			<span class="text">
+				{{if .Issue.IsPull}}
+					Closing this pull request is blocked by:
+				{{else}}
+					Closing this issue is blocked by:
+				{{end}}
+			</span>
 			<div class="ui relaxed divided list">
 				{{range .BlockedByDependencies}}
 				<div class="item">
@@ -155,7 +161,13 @@
 
 			{{if .BlockingDependencies}}
 			<div class="ui relaxed divided list">
-				<span class="text">This issue blocks closing of the following issues:</span>
+				<span class="text">
+					{{if .Issue.IsPull}}
+						This pull request blocks closing of the following issues:
+					{{else}}
+						This issue blocks closing of the following issues:
+					{{end}}
+				</span>
 				{{range .BlockingDependencies}}
 				<div class="item">
 					<div class="right floated content">