Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
brainfood
/
videojs-contrib-hls
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
29963166
authored
2015-05-28 14:20:53 -0400
by
David LaPalomento
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
@dmlap add a contrib option to merge PRs without squashing. closes #287
1 parent
4f6eaeb6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
0 deletions
CHANGELOG.md
contrib.json
CHANGELOG.md
View file @
2996316
...
...
@@ -8,6 +8,7 @@ CHANGELOG
*
@gkatsev ensure segments without an initial IDR are not displayed in 4
*
@mikrohard: wait for an SPS to inject metadata tags. (
[
view
](
https://github.com/videojs/videojs-contrib-hls/pull/280
)
)
*
@mikrohard: Trim whitespace in playlist. (
[
view
](
https://github.com/videojs/videojs-contrib-hls/pull/282
)
)
*
@dmlap add a contrib option to merge PRs without squashing (
[
view
](
https://github.com/videojs/videojs-contrib-hls/pull/287
)
)
--------------------
...
...
contrib.json
View file @
2996316
...
...
@@ -100,6 +100,13 @@
{
"include"
:
"update {{meta.branches.development}}"
},
{
"include"
:
"pull_request accept"
}
]
},
"accept-as-is"
:
{
"desc"
:
"Merge a submitted feature without squashing commits"
,
"steps"
:
[
{
"include"
:
"update {{meta.branches.development}}"
},
{
"include"
:
"pull_request accept-as-is"
}
]
}
},
...
...
@@ -140,6 +147,13 @@
{
"include"
:
"update {{meta.branches.release}}"
},
{
"include"
:
"pull_request accept"
}
]
},
"accept-as-is"
:
{
"desc"
:
"Merge a submitted patch without squashing commits"
,
"steps"
:
[
{
"include"
:
"update {{meta.branches.release}}"
},
{
"include"
:
"pull_request accept-as-is"
}
]
}
},
...
...
@@ -345,6 +359,26 @@
[
"git push upstream {{pr.base.ref}}"
,
"Push the changes to the main project"
],
[
"git branch -D {{pr.user.login}}-{{pr.head.ref}}"
,
"Delete the local branch used for merging"
]
]
},
"accept-as-is"
:
{
"steps"
:
[
{
"prompt"
:
"text"
,
"id"
:
"prNum"
,
"desc"
:
"What is the the pull request number?"
},
{
"get"
:
"{{meta.urls.repo_api}}/pulls/{{prNum}}"
,
"desc"
:
"Get the PR information"
,
"id"
:
"pr"
},
{
"get"
:
"{{meta.urls.repo_api}}/pulls/{{prNum}}/commits"
,
"desc"
:
"Get the PR commits to access author info"
,
"id"
:
"prCommits"
},
[
"git checkout -b {{pr.user.login}}-{{pr.head.ref}} {{pr.base.ref}}"
,
"Create a new branch for merging the changes"
],
[
"git pull --rebase {{pr.head.repo.ssh_url}}"
,
"Merge and rebase the changes"
],
[
"grunt test"
,
"Run tests to make sure they still pass"
],
{
"prompt"
:
"text"
,
"id"
:
"line"
,
"desc"
:
"Describe this change in one line"
},
[
"grunt chg-add:'{{line}} ([view](https
\\
://github.com/{{meta.org}}/{{meta.name}}/pull/{{prNum}}))'"
,
"Add a line to the changelog"
],
[
"git add CHANGELOG.md"
,
"Add the changlelog change to be committed"
],
[
"git commit -a --author='{{prCommits.[0].commit.author.name}} <{{prCommits.[0].commit.author.email}}>' -m '{{line}}. closes #{{prNum}}'"
,
"Commit the changes"
],
{
"prompt"
:
"confirm"
,
"desc"
:
"Does everything look ok?"
},
[
"git checkout {{pr.base.ref}}"
,
"Check out the base branch"
],
[
"git merge --no-ff {{pr.user.login}}-{{pr.head.ref}}"
,
"Merge the changes"
],
[
"git push origin {{pr.base.ref}}"
,
"Push the changes to your remote copy of the project"
],
[
"git push upstream {{pr.base.ref}}"
,
"Push the changes to the main project"
],
[
"git branch -D {{pr.user.login}}-{{pr.head.ref}}"
,
"Delete the local branch used for merging"
]
]
}
}
}
...
...
Please
register
or
sign in
to post a comment