| index.jsView |
|---|
| 2165 | 2165 … | return renderIssueActivityMsg(repo, pr, |
| 2166 | 2166 … | 'pull request', postId, item) |
| 2167 | 2167 … | }) |
| 2168 | 2168 … | ), |
| 2169 | | - isPublic ? pull.empty() : readOnce(function (cb) { |
| 2169 … | + !isPublic && isAuthor && pull.once( |
| 2170 … | + '<section class="merge-instructions">' + |
| 2171 … | + '<input type="checkbox" class="toggle" id="merge-instructions"/>' + |
| 2172 … | + '<h4><label for="merge-instructions" class="toggle-link"><a>' + |
| 2173 … | + 'Merge via command line…' + |
| 2174 … | + '</a></label></h4>' + |
| 2175 … | + '<div class="contents">' + |
|
| 2176 … | + '<p>Check out the branch and test the changes:</p>' + |
| 2177 … | + '<pre>' + |
| 2178 … | + 'git fetch ssb://' + escapeHTML(pr.headRepo) + ' ' + |
| 2179 … | + escapeHTML(pr.headBranch) + '\n' + |
| 2180 … | + 'git checkout -b ' + escapeHTML(pr.headBranch) + ' FETCH_HEAD' + |
| 2181 … | + '</pre>' + |
| 2182 … | + '<p>Merge the changes and push to update the base branch:</p>' + |
| 2183 … | + '<pre>' + |
| 2184 … | + 'git checkout ' + escapeHTML(pr.baseBranch) + '\n' + |
| 2185 … | + 'git merge ' + escapeHTML(pr.headBranch) + '\n' + |
| 2186 … | + 'git push ssb ' + escapeHTML(pr.baseBranch) + |
| 2187 … | + '</pre>' + |
| 2188 … | + '</div></section>'), |
| 2189 … | + !isPublic && readOnce(function (cb) { |
| 2170 | 2190 … | cb(null, renderIssueCommentForm(pr, repo, newestMsg.key, isAuthor, |
| 2171 | 2191 … | 'pull request')) |
| 2172 | 2192 … | }) |
| 2173 | 2193 … | ]) |
| 2350 | 2370 … | var currentDay |
| 2351 | 2371 … | return cb(null, pull( |
| 2352 | 2372 … | headRepo.readLog(headBranch), |
| 2353 | 2373 … | pull.take(function (rev) { return rev != baseBranchRev }), |
| 2354 | | - |
| 2355 | 2374 … | pullReverse(), |
| 2356 | 2375 … | paramap(headRepo.getCommitParsed.bind(headRepo), 8), |
| 2357 | 2376 … | pull.map(function (commit) { |
| 2358 | 2377 … | var commitPath = [baseRepo.id, 'commit', commit.id] |