diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-19 12:12:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-19 12:12:23 +0000 |
| commit | ac782f562dbd9adba42f5ee1d2c3c997f75a95b9 (patch) | |
| tree | 06d0dfa11bfb841c6f9abe22b9b3c5543cfc42fc | |
| parent | 83f5955ee342af01cea7a9a2e18089a3de615a06 (diff) | |
| parent | 127ef49ff9f66c03ce7ac231c4ca163e7741bce6 (diff) | |
| download | gitlab-ce-ac782f562dbd9adba42f5ee1d2c3c997f75a95b9.tar.gz | |
Merge branch '34754-graphql-policy-update' into 'master'
Update GraphQL licensing situation in the docs
See merge request gitlab-org/gitlab-ce!14940
| -rw-r--r-- | doc/api/README.md | 16 | ||||
| -rw-r--r-- | doc/development/licensing.md | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/doc/api/README.md b/doc/api/README.md index 3fd4c97e536..3145c9b676f 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -63,7 +63,21 @@ following locations: ## Road to GraphQL -We have changed our plans to move to GraphQL. After reviewing the GraphQL license, anything related to the Facebook BSD plus patent license will not be allowed at GitLab. +Going forward, we will start on moving to +[GraphQL](http://graphql.org/learn/best-practices/) and deprecate the use of +controller-specific endpoints. GraphQL has a number of benefits: + +1. We avoid having to maintain two different APIs. +2. Callers of the API can request only what they need. +3. It is versioned by default. + +It will co-exist with the current v4 REST API. If we have a v5 API, this should +be a compatibility layer on top of GraphQL. + +Although there were some patenting and licensing concerns with GraphQL, these +have been resolved to our satisfaction by the relicensing of the reference +implementations under MIT, and the use of the OWF license for the GraphQL +specification. ## Basic usage diff --git a/doc/development/licensing.md b/doc/development/licensing.md index a75cdf22f40..902b1c74a42 100644 --- a/doc/development/licensing.md +++ b/doc/development/licensing.md @@ -56,6 +56,7 @@ Libraries with the following licenses are acceptable for use: - [ISC License][ISC] (also known as the OpenBSD License): A permissive (non-copyleft) license as defined by the Open Source Initiative. - [Creative Commons Zero (CC0)][CC0]: A public domain dedication, recommended as a way to disclaim copyright on your work to the maximum extent possible. - [Unlicense][UNLICENSE]: Another public domain dedication. +- [OWFa 1.0][OWFa1]: An open-source license and patent grant designed for specifications. ## Unacceptable Licenses @@ -105,6 +106,7 @@ Gems which are included only in the "development" or "test" groups by Bundler ar [OSL-GNU]: https://www.gnu.org/licenses/license-list.en.html#OSL [Org-Repo]: https://gitlab.com/gitlab-com/organization [UNLICENSE]: https://unlicense.org +[OWFa1]: http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0 [Facebook]: https://code.facebook.com/pages/850928938376556 [x-list]: https://www.apache.org/legal/resolved.html#category-x [Acceptable-Licenses]: #acceptable-licenses |