diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 850b3e6a3d..b286e8be13 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1625,6 +1625,9 @@ issues.label.filter_sort.reverse_by_size = Largest size
 issues.development = Development
 issues.maybefixed = May be fixed by %s
 issues.create_branch_from_issue_success = Create branch %s from issue successfully
+issues.pr.completed = Completed
+issues.pr.conflicted = Merge conflicts
+issues.link.created = Created %s
 issues.num_participants = %d Participants
 issues.attachment.open_tab = `Click to see "%s" in a new tab`
 issues.attachment.download = `Click to download "%s"`
diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go
index c5ac40226f..649d8c7ca4 100644
--- a/routers/web/repo/branch.go
+++ b/routers/web/repo/branch.go
@@ -221,7 +221,6 @@ func handleCreateBranchError(ctx *context.Context, err error, form *forms.NewBra
 	}
 
 	ctx.ServerError("CreateNewBranch", err)
-	return
 }
 
 // CreateBranch creates new branch in repository
diff --git a/routers/web/repo/issue_dev.go b/routers/web/repo/issue_dev.go
index a32c051961..8f9548beb8 100644
--- a/routers/web/repo/issue_dev.go
+++ b/routers/web/repo/issue_dev.go
@@ -95,10 +95,10 @@ func CreateBranchFromIssue(ctx *context.Context) {
 	}
 
 	if err := issues_model.CreateIssueDevLink(ctx, &issues_model.IssueDevLink{
-		IssueID:   issue.ID,
-		LinkType:  issues_model.IssueDevLinkTypeBranch,
+		IssueID:      issue.ID,
+		LinkType:     issues_model.IssueDevLinkTypeBranch,
 		LinkedRepoID: repo.ID,
-		LinkIndex: form.NewBranchName,
+		LinkIndex:    form.NewBranchName,
 	}); err != nil {
 		ctx.ServerError("CreateIssueDevLink", err)
 		return
diff --git a/templates/repo/issue/view_content/sidebar_development.tmpl b/templates/repo/issue/view_content/sidebar_development.tmpl
index f50966ad4a..12e3e8bd70 100644
--- a/templates/repo/issue/view_content/sidebar_development.tmpl
+++ b/templates/repo/issue/view_content/sidebar_development.tmpl
@@ -11,13 +11,17 @@
 		</a>
 		</span>
 		<div>
-		Created {{DateTime "short" .PullRequest.Issue.CreatedUnix}}
+		{{ctx.Locale.Tr "repo.issues.link.created" (DateTime "short" .PullRequest.Issue.CreatedUnix)}}
 		{{if .PullRequest.HasMerged}}
-			Completed
-			{{.PullRequest.MergedCommitID}}
-			Created {{.PullRequest.MergedUnix}}
+			{{ctx.Locale.Tr "repo.issues.pr.completed"}}
+			</div>
+			<div>
+			{{svg "octicon-git-commit" 14}} <a href="{{.PullRequest.BaseRepo.Link}}/src/commit/{{.PullRequest.MergedCommitID}}">{{.PullRequest.MergedCommitID | ShortSha}}</a>
+			</div>
+			<div>
+			{{ctx.Locale.Tr "repo.issues.link.created" (DateTime "short" .PullRequest.MergedUnix)}}
 		{{else if .PullRequest.ChangedProtectedFiles}}
-			Merge conflicts
+			{{ctx.Locale.Tr "repo.issues.pr.conflicted"}}
 		{{end}}
 		</div>
 	{{else if and .Branch .DisplayBranch}}