From e2608dc8d1c4672424879aa6d6bac2aaf34b5bba Mon Sep 17 00:00:00 2001 From: Andrew Lee Rubinger Date: Thu, 14 Nov 2024 11:44:18 -0800 Subject: [PATCH 1/9] Update config.yml with now-valid Discord link --- .github/ISSUE_TEMPLATE/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 827b7922..0ba9db25 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,4 +1,4 @@ contact_links: - name: ❓ Questions and Help 🤔 - url: https://discord.gg/block (/add your discord channel if applicable) + url: https://discord.gg/block-opensource (/add your discord channel if applicable) about: This issue tracker is not for support questions. Please refer to the community for more help. From a7ff5fc40631f2ca6eeed9c4e80316ad2206ebca Mon Sep 17 00:00:00 2001 From: Andrew Lee Rubinger Date: Fri, 6 Dec 2024 12:32:17 -0500 Subject: [PATCH 2/9] Issue #25: Remove strong language about GC as oversight for technical direction Existing copy that GC is available as a resource for remediation will suffice --- GOVERNANCE.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index aa2f1a03..1961bc71 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -30,7 +30,7 @@ Maintainers have write access to GitHub repositories and act as project administ Both maintainers and non-maintainers may propose changes to source code. The mechanism to propose such a change is a GitHub pull request. Maintainers review and merge (_land_) pull requests. -If a maintainer opposes a proposed change, then the change cannot land. The exception is if the Governance Committee (GC) votes to approve the change despite the opposition. Usually, involving the GC is unnecessary. +If a maintainer opposes a proposed change, then the change cannot land. See: @@ -49,11 +49,9 @@ See: The Block Open Source Governance Committee (GC) has final authority over this project, including: -* Technical direction * Project governance and process (including this policy) * Contribution policy * GitHub repository hosting * Conduct guidelines -* Maintaining the list of maintainers The GC may be reached through `open-source-governance@block.xyz` and is an available resource in mediation or for sensitive cases beyond the scope of project maintainers. It operates as a "Self-appointing council or board" as defined by Red Hat: [Open Source Governance Models](https://www.redhat.com/en/blog/understanding-open-source-governance-models). From cf5cb7f090af2dac01b55b29e1a6792480269e90 Mon Sep 17 00:00:00 2001 From: Andrew Lee Rubinger Date: Tue, 24 Dec 2024 13:03:04 -0800 Subject: [PATCH 3/9] Remove fragile external file references --- GOVERNANCE.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 1961bc71..577f508a 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -32,11 +32,6 @@ source code. The mechanism to propose such a change is a GitHub pull request. Ma If a maintainer opposes a proposed change, then the change cannot land. -See: - -* [List of maintainers - `MAINTAINERS.md`](./MAINTAINERS.md) -* [Contribution Guide - `CONTRIBUTING.md`](./CONTRIBUTING.md) - ### Maintainer activities * Helping users and novice contributors From 9345bdfadba25ecb61874e9f1e82837da01f5e88 Mon Sep 17 00:00:00 2001 From: Andrew Lee Rubinger Date: Tue, 24 Dec 2024 13:14:56 -0800 Subject: [PATCH 4/9] Update CODE_OF_CONDUCT.md Per feedback --- CODE_OF_CONDUCT.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index b8e82186..636e7ff7 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -58,13 +58,7 @@ This Code of Conduct applies within all project spaces, and it also applies when ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the Block Open Source Governance Committee (GC) at -`open-source-governance@block.xyz`. All complaints will be reviewed and -investigated promptly and fairly. - -The GC is obligated to respect the privacy and security of the -reporter of any incident. +Instances of unacceptable behavior may be reported to the GoC at `open-source-governance@block.xyz`. All complaints will be reviewed and investigated promptly and fairly, and will result in a response that is deemed necessary and appropriate to the circumstances. ## Enforcement Guidelines From 8365d97c7442dc621a785e807d61af642a745f20 Mon Sep 17 00:00:00 2001 From: Andrew Lee Rubinger Date: Tue, 24 Dec 2024 13:16:52 -0800 Subject: [PATCH 5/9] Link email in CoC --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 636e7ff7..2491b72f 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -58,7 +58,7 @@ This Code of Conduct applies within all project spaces, and it also applies when ## Enforcement -Instances of unacceptable behavior may be reported to the GoC at `open-source-governance@block.xyz`. All complaints will be reviewed and investigated promptly and fairly, and will result in a response that is deemed necessary and appropriate to the circumstances. +Instances of unacceptable behavior may be reported to the GoC at [`open-source-governance@block.xyz`](mailto:open-source-governance@block.xyz). All complaints will be reviewed and investigated promptly and fairly, and will result in a response that is deemed necessary and appropriate to the circumstances. ## Enforcement Guidelines From b3dd874a3c4bb3a610daa8658dd39e19e860072b Mon Sep 17 00:00:00 2001 From: Andrew Lee Rubinger Date: Mon, 6 Jan 2025 15:51:55 -0800 Subject: [PATCH 6/9] Updates to Block CoC --- CODE_OF_CONDUCT.md | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 2491b72f..7835caea 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -21,24 +21,20 @@ diverse, inclusive, and healthy community. Examples of behavior that contributes to a positive environment for our community include: -* Demonstrating empathy and kindness toward other people -* Being respectful and welcoming of differing opinions, viewpoints, and experiences -* Giving and gracefully accepting constructive feedback -* Accepting responsibility and apologizing to those affected by our mistakes, - and learning from the experience -* Focusing on what is best not just for us as individuals, but for the overall - community +* **Be open.** We invite anyone to participate in any aspect of our projects. Our community is open, and any responsibility can be carried by a contributor who demonstrates the required capacity and competence. +* **Be considerate.** People use our work, and we depend on the work of others. Consider users and colleagues before taking action. For example, changes to code, infrastructure, policy, and documentation may negatively impact others. +* **Be respectful.** We expect people to work together to resolve conflict, assume good intentions, and act with empathy. Do not turn disagreements into personal attacks. +* **Be collaborative.** Collaboration reduces redundancy and improves the quality of our work. We strive for transparency within our open source community, and we work closely with upstream developers and others in the free software community to coordinate our efforts. +* **Be pragmatic.** Questions are encouraged and should be asked early in the process to avoid problems later. Be thoughtful and considerate when seeking out the appropriate forum for your questions. Those who are asked should be responsive and helpful. +* **Step down considerately.** Members of every project come and go. When somebody leaves or disengages from the project, they should make it known and take the proper steps to ensure that others can pick up where they left off. Examples of unacceptable behavior include: - -* The use of sexualized language or imagery, and sexual attention or advances of - any kind +* The use of sexualized language or imagery, and sexual attention or advances of any kind * Trolling, insulting or derogatory comments, and personal or political attacks * Public or private harassment -* Publishing others' private information, such as a physical or email address, - without their explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting +* Publishing others' private information, such as a physical or email address, without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + ## Enforcement Responsibilities From def60b545d220063b750419534db40c1a5a95ad4 Mon Sep 17 00:00:00 2001 From: Andrew Lee Rubinger Date: Mon, 13 Jan 2025 23:23:58 -0800 Subject: [PATCH 7/9] Fix typo in CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 7835caea..b4f25a27 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -54,7 +54,7 @@ This Code of Conduct applies within all project spaces, and it also applies when ## Enforcement -Instances of unacceptable behavior may be reported to the GoC at [`open-source-governance@block.xyz`](mailto:open-source-governance@block.xyz). All complaints will be reviewed and investigated promptly and fairly, and will result in a response that is deemed necessary and appropriate to the circumstances. +Instances of unacceptable behavior may be reported to the GC at [`open-source-governance@block.xyz`](mailto:open-source-governance@block.xyz). All complaints will be reviewed and investigated promptly and fairly, and will result in a response that is deemed necessary and appropriate to the circumstances. ## Enforcement Guidelines From 98ce46917e6b51f63f667dd5a776cca4ebba4ca0 Mon Sep 17 00:00:00 2001 From: Andrew Lee Rubinger Date: Tue, 14 Jan 2025 13:32:50 -0800 Subject: [PATCH 8/9] Update LICENSE to 2025 --- LICENSE | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index ebd7b4b0..1bc469e6 100644 --- a/LICENSE +++ b/LICENSE @@ -186,15 +186,13 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] - Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 -Copyright 2023 Block, Inc. +Copyright 2025 Block, Inc. Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, From b0d2e5c714143a4624e653bdfc893a68f9d7caab Mon Sep 17 00:00:00 2001 From: joecoufal-block-xyz Date: Tue, 14 Jan 2025 17:00:55 -0500 Subject: [PATCH 9/9] Update CODE_OF_CONDUCT.md (#3) --- CODE_OF_CONDUCT.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index b4f25a27..9fb675e3 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,7 +1,7 @@ # Block Code of Conduct -Block's mission is Economic Empowerment. This means opening the global economy to everyone. We extend the same principles of inclusion to our developer ecosystem. We are excited to build with you. So we will ensure our community is truly open, transparent and inclusive. Because of the global nature of our project, diversity and inclusivity is paramount to our success. We not only welcome diverse perspectives, we **need** them! +Block's purpose is Economic Empowerment. This means opening the global economy to everyone. We extend the same principles of inclusion to our developer ecosystem. We are excited to build with you, and want to ensure our community is truly open, transparent and inclusive. Because of the global nature of our project, diversity and inclusivity is paramount to our success. We not only welcome diverse perspectives, we **need** them! The code of conduct below reflects the expectations for ourselves and for our community. @@ -75,7 +75,7 @@ behavior was inappropriate. A public apology may be requested. **Community Impact**: A violation through a single incident or series of actions. -**Consequence**: A warning with consequences for continued behavior. No +**Consequence**: A warning with consequences for continued behavior. The offending party is warned to have no interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels @@ -102,7 +102,7 @@ Violating these terms may lead to a permanent ban. standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals. -**Consequence**: A permanent ban from any sort of public interaction within the +**Consequence**: A permanent ban from any form of public interaction within the community. ## Attribution