David LaPalomento
f7ecdae6c1
pull in the PR head reference
specify the branch to pull from when accepting a PR as-is.
10 years ago
David LaPalomento
6fe0e7a177
Rebase PRs against their base branch
Put the changes on top of their base, instead of the other way around.
10 years ago
David LaPalomento
310d41f1c9
Quote the merge commit message
accept-as-is was failing because the merge commit message was unquoted.
10 years ago
David LaPalomento
9ea83820c3
Whitespace fix
Remove extra leading space.
10 years ago
David LaPalomento
db5f43649a
Pull and rebase simultaneously and use non-interactive amend
Simplify the PR rebasing. Make sure the editor isn't invoked to amend the merge commit with the changelog update. Move tests to after the change has been fully merged.
10 years ago
David LaPalomento
4f2d554c43
Reuse the merge commit for the changelog update
Modify the accept-as-is contrib.json task to add the changelog entry to a custom merge commit.
10 years ago
David LaPalomento
c2e40ebae8
Quote the merge commit message
accept-as-is was failing because the merge commit message was unquoted.
10 years ago
David LaPalomento
f6412ae99b
Whitespace fix
Remove extra leading space.
10 years ago
David LaPalomento
cfd8ae9152
Pull and rebase simultaneously and use non-interactive amend
Simplify the PR rebasing. Make sure the editor isn't invoked to amend the merge commit with the changelog update. Move tests to after the change has been fully merged.
10 years ago
David LaPalomento
0bb6541d74
Reuse the merge commit for the changelog update
Modify the accept-as-is contrib.json task to add the changelog entry to a custom merge commit.
10 years ago
David LaPalomento
83073c7163
Update contrib release task
Remove video.js specific tasks. Add release-related grunt task configs.
10 years ago
David LaPalomento
29963166d3
@dmlap add a contrib option to merge PRs without squashing. closes #287
10 years ago
David LaPalomento
e3aa0fc0ad
@dmlap add a contribflow configuration. closes #276
10 years ago