Skip to content

Commit 1ef3200

Browse files
authored
Merge pull request #19 from nullscreen/update-license-to-mit
Update license to MIT
2 parents 0822ad0 + 43112f1 commit 1ef3200

File tree

4 files changed

+40
-237
lines changed

4 files changed

+40
-237
lines changed

CHANGELOG.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,33 @@
22

33
## 0.7.0
44

5-
- Add support for Rails 6 [#18](https://github.com/machinima/epilog/pull/18)
5+
- Add support for Rails 6 [#18](https://github.com/nullscreen/epilog/pull/18)
66

77
## 0.6.0
88

9-
- Add support for Rails 5 API-only controllers [#17](https://github.com/machinima/epilog/pull/17)
9+
- Add support for Rails 5 API-only controllers [#17](https://github.com/nullscreen/epilog/pull/17)
1010

1111
## 0.5.0
1212

13-
- Add options to enable/disable start and end logs [#15](https://github.com/machinima/epilog/pull/15)
14-
- Fix with_context to use ensure [#16](https://github.com/machinima/epilog/pull/16)
13+
- Add options to enable/disable start and end logs [#15](https://github.com/nullscreen/epilog/pull/15)
14+
- Fix with_context to use ensure [#16](https://github.com/nullscreen/epilog/pull/16)
1515

1616
## 0.4.0
1717

18-
- Add context support to Logger [#12](https://github.com/machinima/epilog/pull/12)
18+
- Add context support to Logger [#12](https://github.com/nullscreen/epilog/pull/12)
1919

2020
## 0.3.1
2121

22-
- Add context to request log [#10](https://github.com/machinima/epilog/pull/10)
22+
- Add context to request log [#10](https://github.com/nullscreen/epilog/pull/10)
2323

2424
## 0.3
2525

26-
- Update development dependencies [#1](https://github.com/machinima/epilog/pull/1)
27-
- Allow controllers to add context to logs [#2](https://github.com/machinima/epilog/pull/2)
28-
- Fix removing Rails default parameters when filter_parameters are set [#4](https://github.com/machinima/epilog/pull/4)
29-
- Add a filter using Rails filter_parameters [#3](https://github.com/machinima/epilog/pull/3)
30-
- Change action view logs to DEBUG [#5](https://github.com/machinima/epilog/pull/5)
31-
- Filter all request data using filter_parameters [#6](https://github.com/machinima/epilog/pull/6)
26+
- Update development dependencies [#1](https://github.com/nullscreen/epilog/pull/1)
27+
- Allow controllers to add context to logs [#2](https://github.com/nullscreen/epilog/pull/2)
28+
- Fix removing Rails default parameters when filter_parameters are set [#4](https://github.com/nullscreen/epilog/pull/4)
29+
- Add a filter using Rails filter_parameters [#3](https://github.com/nullscreen/epilog/pull/3)
30+
- Change action view logs to DEBUG [#5](https://github.com/nullscreen/epilog/pull/5)
31+
- Filter all request data using filter_parameters [#6](https://github.com/nullscreen/epilog/pull/6)
3232

3333
## 0.2
3434

LICENSE.txt

+20-201
Original file line numberDiff line numberDiff line change
@@ -1,201 +1,20 @@
1-
Apache License
2-
Version 2.0, January 2004
3-
http://www.apache.org/licenses/
4-
5-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6-
7-
1. Definitions.
8-
9-
"License" shall mean the terms and conditions for use, reproduction,
10-
and distribution as defined by Sections 1 through 9 of this document.
11-
12-
"Licensor" shall mean the copyright owner or entity authorized by
13-
the copyright owner that is granting the License.
14-
15-
"Legal Entity" shall mean the union of the acting entity and all
16-
other entities that control, are controlled by, or are under common
17-
control with that entity. For the purposes of this definition,
18-
"control" means (i) the power, direct or indirect, to cause the
19-
direction or management of such entity, whether by contract or
20-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21-
outstanding shares, or (iii) beneficial ownership of such entity.
22-
23-
"You" (or "Your") shall mean an individual or Legal Entity
24-
exercising permissions granted by this License.
25-
26-
"Source" form shall mean the preferred form for making modifications,
27-
including but not limited to software source code, documentation
28-
source, and configuration files.
29-
30-
"Object" form shall mean any form resulting from mechanical
31-
transformation or translation of a Source form, including but
32-
not limited to compiled object code, generated documentation,
33-
and conversions to other media types.
34-
35-
"Work" shall mean the work of authorship, whether in Source or
36-
Object form, made available under the License, as indicated by a
37-
copyright notice that is included in or attached to the work
38-
(an example is provided in the Appendix below).
39-
40-
"Derivative Works" shall mean any work, whether in Source or Object
41-
form, that is based on (or derived from) the Work and for which the
42-
editorial revisions, annotations, elaborations, or other modifications
43-
represent, as a whole, an original work of authorship. For the purposes
44-
of this License, Derivative Works shall not include works that remain
45-
separable from, or merely link (or bind by name) to the interfaces of,
46-
the Work and Derivative Works thereof.
47-
48-
"Contribution" shall mean any work of authorship, including
49-
the original version of the Work and any modifications or additions
50-
to that Work or Derivative Works thereof, that is intentionally
51-
submitted to Licensor for inclusion in the Work by the copyright owner
52-
or by an individual or Legal Entity authorized to submit on behalf of
53-
the copyright owner. For the purposes of this definition, "submitted"
54-
means any form of electronic, verbal, or written communication sent
55-
to the Licensor or its representatives, including but not limited to
56-
communication on electronic mailing lists, source code control systems,
57-
and issue tracking systems that are managed by, or on behalf of, the
58-
Licensor for the purpose of discussing and improving the Work, but
59-
excluding communication that is conspicuously marked or otherwise
60-
designated in writing by the copyright owner as "Not a Contribution."
61-
62-
"Contributor" shall mean Licensor and any individual or Legal Entity
63-
on behalf of whom a Contribution has been received by Licensor and
64-
subsequently incorporated within the Work.
65-
66-
2. Grant of Copyright License. Subject to the terms and conditions of
67-
this License, each Contributor hereby grants to You a perpetual,
68-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69-
copyright license to reproduce, prepare Derivative Works of,
70-
publicly display, publicly perform, sublicense, and distribute the
71-
Work and such Derivative Works in Source or Object form.
72-
73-
3. Grant of Patent License. Subject to the terms and conditions of
74-
this License, each Contributor hereby grants to You a perpetual,
75-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76-
(except as stated in this section) patent license to make, have made,
77-
use, offer to sell, sell, import, and otherwise transfer the Work,
78-
where such license applies only to those patent claims licensable
79-
by such Contributor that are necessarily infringed by their
80-
Contribution(s) alone or by combination of their Contribution(s)
81-
with the Work to which such Contribution(s) was submitted. If You
82-
institute patent litigation against any entity (including a
83-
cross-claim or counterclaim in a lawsuit) alleging that the Work
84-
or a Contribution incorporated within the Work constitutes direct
85-
or contributory patent infringement, then any patent licenses
86-
granted to You under this License for that Work shall terminate
87-
as of the date such litigation is filed.
88-
89-
4. Redistribution. You may reproduce and distribute copies of the
90-
Work or Derivative Works thereof in any medium, with or without
91-
modifications, and in Source or Object form, provided that You
92-
meet the following conditions:
93-
94-
(a) You must give any other recipients of the Work or
95-
Derivative Works a copy of this License; and
96-
97-
(b) You must cause any modified files to carry prominent notices
98-
stating that You changed the files; and
99-
100-
(c) You must retain, in the Source form of any Derivative Works
101-
that You distribute, all copyright, patent, trademark, and
102-
attribution notices from the Source form of the Work,
103-
excluding those notices that do not pertain to any part of
104-
the Derivative Works; and
105-
106-
(d) If the Work includes a "NOTICE" text file as part of its
107-
distribution, then any Derivative Works that You distribute must
108-
include a readable copy of the attribution notices contained
109-
within such NOTICE file, excluding those notices that do not
110-
pertain to any part of the Derivative Works, in at least one
111-
of the following places: within a NOTICE text file distributed
112-
as part of the Derivative Works; within the Source form or
113-
documentation, if provided along with the Derivative Works; or,
114-
within a display generated by the Derivative Works, if and
115-
wherever such third-party notices normally appear. The contents
116-
of the NOTICE file are for informational purposes only and
117-
do not modify the License. You may add Your own attribution
118-
notices within Derivative Works that You distribute, alongside
119-
or as an addendum to the NOTICE text from the Work, provided
120-
that such additional attribution notices cannot be construed
121-
as modifying the License.
122-
123-
You may add Your own copyright statement to Your modifications and
124-
may provide additional or different license terms and conditions
125-
for use, reproduction, or distribution of Your modifications, or
126-
for any such Derivative Works as a whole, provided Your use,
127-
reproduction, and distribution of the Work otherwise complies with
128-
the conditions stated in this License.
129-
130-
5. Submission of Contributions. Unless You explicitly state otherwise,
131-
any Contribution intentionally submitted for inclusion in the Work
132-
by You to the Licensor shall be under the terms and conditions of
133-
this License, without any additional terms or conditions.
134-
Notwithstanding the above, nothing herein shall supersede or modify
135-
the terms of any separate license agreement you may have executed
136-
with Licensor regarding such Contributions.
137-
138-
6. Trademarks. This License does not grant permission to use the trade
139-
names, trademarks, service marks, or product names of the Licensor,
140-
except as required for reasonable and customary use in describing the
141-
origin of the Work and reproducing the content of the NOTICE file.
142-
143-
7. Disclaimer of Warranty. Unless required by applicable law or
144-
agreed to in writing, Licensor provides the Work (and each
145-
Contributor provides its Contributions) on an "AS IS" BASIS,
146-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147-
implied, including, without limitation, any warranties or conditions
148-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149-
PARTICULAR PURPOSE. You are solely responsible for determining the
150-
appropriateness of using or redistributing the Work and assume any
151-
risks associated with Your exercise of permissions under this License.
152-
153-
8. Limitation of Liability. In no event and under no legal theory,
154-
whether in tort (including negligence), contract, or otherwise,
155-
unless required by applicable law (such as deliberate and grossly
156-
negligent acts) or agreed to in writing, shall any Contributor be
157-
liable to You for damages, including any direct, indirect, special,
158-
incidental, or consequential damages of any character arising as a
159-
result of this License or out of the use or inability to use the
160-
Work (including but not limited to damages for loss of goodwill,
161-
work stoppage, computer failure or malfunction, or any and all
162-
other commercial damages or losses), even if such Contributor
163-
has been advised of the possibility of such damages.
164-
165-
9. Accepting Warranty or Additional Liability. While redistributing
166-
the Work or Derivative Works thereof, You may choose to offer,
167-
and charge a fee for, acceptance of support, warranty, indemnity,
168-
or other liability obligations and/or rights consistent with this
169-
License. However, in accepting such obligations, You may act only
170-
on Your own behalf and on Your sole responsibility, not on behalf
171-
of any other Contributor, and only if You agree to indemnify,
172-
defend, and hold each Contributor harmless for any liability
173-
incurred by, or claims asserted against, such Contributor by reason
174-
of your accepting any such warranty or additional liability.
175-
176-
END OF TERMS AND CONDITIONS
177-
178-
APPENDIX: How to apply the Apache License to your work.
179-
180-
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "{}"
182-
replaced with your own identifying information. (Don't include
183-
the brackets!) The text should be enclosed in the appropriate
184-
comment syntax for the file format. We also recommend that a
185-
file or class name and description of purpose be included on the
186-
same "printed page" as the copyright notice for easier
187-
identification within third-party archives.
188-
189-
Copyright 2018 Warner Bros. Entertainment Inc.
190-
191-
Licensed under the Apache License, Version 2.0 (the "License");
192-
you may not use this file except in compliance with the License.
193-
You may obtain a copy of the License at
194-
195-
http://www.apache.org/licenses/LICENSE-2.0
196-
197-
Unless required by applicable law or agreed to in writing, software
198-
distributed under the License is distributed on an "AS IS" BASIS,
199-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200-
See the License for the specific language governing permissions and
201-
limitations under the License.
1+
The MIT License (MIT)
2+
3+
Copyright © 2022 Nullscreen
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of
6+
this software and associated documentation files (the “Software”), to deal in
7+
the Software without restriction, including without limitation the rights to
8+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
9+
the Software, and to permit persons to whom the Software is furnished to do so,
10+
subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
17+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
18+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
19+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
20+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

+6-22
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Epilog Gem
22

33
[![Gem Version](https://badge.fury.io/rb/epilog.svg)](https://badge.fury.io/rb/epilog)
4-
[![Build Status](https://travis-ci.org/machinima/epilog.svg?branch=master)](https://travis-ci.org/machinima/epilog)
5-
[![Code Climate](https://codeclimate.com/github/machinima/epilog/badges/gpa.svg)](https://codeclimate.com/github/machinima/epilog)
6-
[![Test Coverage](https://codeclimate.com/github/machinima/epilog/badges/coverage.svg)](https://codeclimate.com/github/machinima/epilog)
7-
[![Inline docs](http://inch-ci.org/github/machinima/epilog.svg?branch=master)](http://inch-ci.org/github/machinima/epilog)
4+
[![Build Status](https://travis-ci.org/nullscreen/epilog.svg?branch=master)](https://travis-ci.org/nullscreen/epilog)
5+
[![Code Climate](https://codeclimate.com/github/nullscreen/epilog/badges/gpa.svg)](https://codeclimate.com/github/nullscreen/epilog)
6+
[![Test Coverage](https://codeclimate.com/github/nullscreen/epilog/badges/coverage.svg)](https://codeclimate.com/github/nullscreen/epilog)
7+
[![Inline docs](http://inch-ci.org/github/nullscreen/epilog.svg?branch=master)](http://inch-ci.org/github/nullscreen/epilog)
88

99
A JSON logger with Rails support.
1010

@@ -13,7 +13,7 @@ A JSON logger with Rails support.
1313
Read below to get started, or see the [API Documentation][api-docs] for more
1414
details.
1515

16-
[api-docs]: https://www.rubydoc.info/github/machinima/epilog
16+
[api-docs]: https://www.rubydoc.info/github/nullscreen/epilog
1717

1818
## Installation
1919

@@ -51,20 +51,4 @@ experiment.
5151
## Contributing
5252

5353
Bug reports and pull requests are welcome on GitHub at
54-
https://github.com/machinima/epilog.
55-
56-
## License
57-
58-
Copyright 2018 Warner Bros. Entertainment Inc.
59-
60-
Licensed under the Apache License, Version 2.0 (the "License");
61-
you may not use this file except in compliance with the License.
62-
You may obtain a copy of the License at
63-
64-
http://www.apache.org/licenses/LICENSE-2.0
65-
66-
Unless required by applicable law or agreed to in writing, software
67-
distributed under the License is distributed on an "AS IS" BASIS,
68-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
69-
See the License for the specific language governing permissions and
70-
limitations under the License.
54+
https://github.com/nullscreen/epilog.

epilog.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Gem::Specification.new do |spec|
99
spec.version = Epilog::VERSION
1010
spec.authors = ['Justin Howard']
1111
spec.email = ['[email protected]']
12-
spec.license = 'Apache-2.0'
12+
spec.license = 'MIT'
1313

1414
spec.summary = 'A JSON logger with Rails support'
15-
spec.homepage = 'https://github.com/machinima/epilog'
15+
spec.homepage = 'https://github.com/nullscreen/epilog'
1616

1717
spec.files = `git ls-files -z`
1818
.split("\x0")

0 commit comments

Comments
 (0)