Skip to content

Commit

Permalink
Merge pull request #20 from block/myron/fix-license
Browse files Browse the repository at this point in the history
Move GraphiQL license attribution into README.
  • Loading branch information
myronmarston authored Nov 4, 2024
2 parents 651fc20 + 5f1557a commit 80a37e9
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 10 deletions.
3 changes: 0 additions & 3 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

Part of the distributed code (elasticgraph-rack/lib/elastic_graph/rack/graphiql/index.html)
comes from the GraphiQL project, licensed under the MIT License. Copyright (c) GraphQL Contributors.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,3 +247,11 @@ to follow SemVer with a `0.MAJOR.MINOR.PATCH` versioning scheme.
Note that _all_ gems in this repository share the same version number. Every time we cut a release, we increment the version
for _all_ gems and release _all_ gems, even if a gem has had no changes since the last release. This is simpler to work with
than the alternatives.

## License

ElasticGraph is released under the [MIT License](https://opensource.org/licenses/MIT).

[Part of the distributed code](elasticgraph-rack/lib/elastic_graph/rack/graphiql/index.html)
comes from the [GraphiQL project](https://github.com/graphql/graphiql), also licensed under the
MIT License, Copyright (c) GraphQL Contributors.
3 changes: 0 additions & 3 deletions elasticgraph-rack/LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

Part of the distributed code (lib/elastic_graph/rack/graphiql/index.html)
comes from the GraphiQL project, licensed under the MIT License. Copyright (c) GraphQL Contributors.
8 changes: 8 additions & 0 deletions elasticgraph-rack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,11 @@ run ElasticGraph::Rack::GraphiQL.new(graphql)
```

Run this with `rackup` (after installing the `rackup` gem) or any other rack-compatible server.

## License

elasticgraph-rack is released under the [MIT License](https://opensource.org/licenses/MIT).

[Part of the distributed code](lib/elastic_graph/rack/graphiql/index.html)
comes from the [GraphiQL project](https://github.com/graphql/graphiql), also licensed under the
MIT License, Copyright (c) GraphQL Contributors.
10 changes: 6 additions & 4 deletions elasticgraph-rack/lib/elastic_graph/rack/graphiql/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
## GraphiQL for ElasticGraph

This directory provides the GraphiQL in browser UI for working with ElasticGraph
applications. The GraphiQL license is included in `LICENSE.txt`, copied verbatim
from:

https://github.com/graphql/graphiql/blob/graphiql%402.4.0/LICENSE
applications.

The `index.html` file is copied from:

Expand Down Expand Up @@ -36,3 +33,8 @@ index 55cf5d05..a672ead9 100644
defaultEditorToolsVisibility: true,
}),
```

## License

[index.html](index.html) comes from the [GraphiQL project](https://github.com/graphql/graphiql),
licensed under the MIT License, Copyright (c) GraphQL Contributors.
8 changes: 8 additions & 0 deletions script/update_readme
Original file line number Diff line number Diff line change
Expand Up @@ -216,3 +216,11 @@ to follow SemVer with a `0.MAJOR.MINOR.PATCH` versioning scheme.
Note that _all_ gems in this repository share the same version number. Every time we cut a release, we increment the version
for _all_ gems and release _all_ gems, even if a gem has had no changes since the last release. This is simpler to work with
than the alternatives.

## License

ElasticGraph is released under the [MIT License](https://opensource.org/licenses/MIT).

[Part of the distributed code](elasticgraph-rack/lib/elastic_graph/rack/graphiql/index.html)
comes from the [GraphiQL project](https://github.com/graphql/graphiql), also licensed under the
MIT License, Copyright (c) GraphQL Contributors.

0 comments on commit 80a37e9

Please sign in to comment.