Commit 17902b87345bd7f2aea48ec1a1863920ff23829a
Whitespace
Charles Lehner committed on 10/9/2016, 9:08:04 PMParent: 3a8e21a05397d1f664f95b88c7fd1ac98ee92d13
Files changed
| lib/repos/pulls.js | changed |
| lib/repos/pulls.js | |||
|---|---|---|---|
| @@ -92,14 +92,14 @@ | |||
| 92 | 92 … | self.web.pullReqs.getRevs(pr.id, function (err, revs) { | |
| 93 | 93 … | if (err) return cb(null, self.web.renderError(err)) | |
| 94 | 94 … | GitRepo.getMergeBase(baseRepo, revs.base, headRepo, revs.head, | |
| 95 | 95 … | function (err, mergeBase) { | |
| 96 | - if (err) return cb(null, self.web.renderError(err)) | ||
| 97 | - cb(null, cat([ | ||
| 98 | - pull.once('<section>'), | ||
| 99 | - self.renderCommitLog(req, baseRepo, mergeBase, headRepo, revs.head), | ||
| 100 | - pull.once('</section>') | ||
| 101 | - ])) | ||
| 96 … | + if (err) return cb(null, self.web.renderError(err)) | ||
| 97 … | + cb(null, cat([ | ||
| 98 … | + pull.once('<section>'), | ||
| 99 … | + self.renderCommitLog(req, baseRepo, mergeBase, headRepo, revs.head), | ||
| 100 … | + pull.once('</section>') | ||
| 101 … | + ])) | ||
| 102 | 102 … | } | |
| 103 | 103 … | ) | |
| 104 | 104 … | }) | |
| 105 | 105 … | } | |
| @@ -109,15 +109,15 @@ | |||
| 109 | 109 … | self.web.pullReqs.getRevs(pr.id, function (err, revs) { | |
| 110 | 110 … | if (err) return cb(null, self.web.renderError(err)) | |
| 111 | 111 … | GitRepo.getMergeBase(baseRepo, revs.base, headRepo, revs.head, | |
| 112 | 112 … | function (err, mergeBase) { | |
| 113 | - if (err) return cb(null, self.web.renderError(err)) | ||
| 114 | - cb(null, cat([ | ||
| 115 | - pull.once('<section>'), | ||
| 116 | - self.repo.renderDiffStat(req, | ||
| 117 | - [baseRepo, headRepo], [mergeBase, revs.head]), | ||
| 118 | - pull.once('</section>') | ||
| 119 | - ])) | ||
| 113 … | + if (err) return cb(null, self.web.renderError(err)) | ||
| 114 … | + cb(null, cat([ | ||
| 115 … | + pull.once('<section>'), | ||
| 116 … | + self.repo.renderDiffStat(req, | ||
| 117 … | + [baseRepo, headRepo], [mergeBase, revs.head]), | ||
| 118 … | + pull.once('</section>') | ||
| 119 … | + ])) | ||
| 120 | 120 … | } | |
| 121 | 121 … | ) | |
| 122 | 122 … | }) | |
| 123 | 123 … | } | |
| @@ -197,9 +197,9 @@ | |||
| 197 | 197 … | '</pre>' + | |
| 198 | 198 … | '</div></section>'), | |
| 199 | 199 … | !self.web.isPublic && u.readOnce(function (cb) { | |
| 200 | 200 … | cb(null, forms.issueComment(req, pr, repo, newestMsg.key, | |
| 201 | - req._t('pull request'))) | ||
| 201 … | + req._t('pull request'))) | ||
| 202 | 202 … | }) | |
| 203 | 203 … | ]) | |
| 204 | 204 … | } | |
| 205 | 205 … | ||
Built with git-ssb-web