Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - Note that changes to licensing are controversial #4975

Closed
wants to merge 9 commits into from
Closed

[Merged by Bors] - Note that changes to licensing are controversial #4975

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9356af4
Add licensing and root-level files to controversial criteria
alice-i-cecile Jun 9, 2022
49bc7ae
Add note on the licenses of assets
alice-i-cecile Jun 9, 2022
21ffc21
Clarify licenses of sub-components
alice-i-cecile Jun 10, 2022
3f0c103
Avoid mention of small snippets
alice-i-cecile Jun 10, 2022
0bb7006
Clarify README notes
alice-i-cecile Jun 10, 2022
d0d458c
Wording tweak
alice-i-cecile Jun 10, 2022
7647232
Assets are for examples
alice-i-cecile Jun 10, 2022
67a0663
Remove reference to other dependency's licenses
alice-i-cecile Jul 20, 2022
c537db7
Note presence of other licenses
alice-i-cecile Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ PRs are controversial if there is serious design discussion required, or a large
7. Large-scale code reorganization.
8. High levels of technical complexity.
9. Adding a dependency.
10. Touching licensing information (due to the level of precision required).
11. Adding root-level files (due to the high level of visibility).

Finally, changes are "relatively uncontroversial" if they are neither trivial or controversial.
Most PRs should fall into this category.
Expand Down
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,8 @@ at your option. This means you can select the license you prefer! This dual-lice
Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
additional terms or conditions.

### Assets

Some of the [assets](assets) included in this repository for testing purposes fall under different open licenses.
See [CREDITS.md](CREDITS.md) for the details of the licenses of those files.