diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-02-26 09:28:22 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-02-26 09:28:22 +0000 |
| commit | 3f83d1dc3a6af8854747d695847c75ba41d25cb0 (patch) | |
| tree | 9f069315946869f80bf9af076e65e1eb85bbd5e5 | |
| parent | f37e031bc999a822f315a22bee1deb9c6c12262d (diff) | |
| parent | 2325e3be0793aa29412bc00281df39ed483a841e (diff) | |
| download | gitlab-ce-3f83d1dc3a6af8854747d695847c75ba41d25cb0.tar.gz | |
Merge branch 'patch-1' into 'master'
Reformats confusing '[named here]' section for 3rd party code attribution
Weird formatting originally. Which of the following is the proper format for attribution?
1. Submitted on behalf of a third-party: [David Alexander]
1. Submitted on behalf of a third-party: [[] David Alexander]
1. Submitted on behalf of a third-party: [] David Alexander
1. Submitted on behalf of a third-party: [[ David Alexander ]]
1. ... _etc._
With this change, it allows for either of the following formats:
1. Submitted on behalf of a third-party: [David Alexander]
1. Submitted on behalf of a third-party: David Alexander
See merge request !2861
| -rw-r--r-- | doc/legal/individual_contributor_license_agreement.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/legal/individual_contributor_license_agreement.md b/doc/legal/individual_contributor_license_agreement.md index f97c252fd7c..59803aea080 100644 --- a/doc/legal/individual_contributor_license_agreement.md +++ b/doc/legal/individual_contributor_license_agreement.md @@ -18,7 +18,7 @@ You accept and agree to the following terms and conditions for Your present and 6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON- INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. -7. Should You wish to submit work that is not Your original creation, You may submit it to GitLab B.V. separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [[]named here]". +7. Should You wish to submit work that is not Your original creation, You may submit it to GitLab B.V. separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [insert_name_here]". 8. You agree to notify GitLab B.V. of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect. |