Skip to content

Commit

Permalink
Merge branch 'master' into tatianahernandez-patch-3
Browse files Browse the repository at this point in the history
  • Loading branch information
civicactionsbot authored Feb 12, 2025
2 parents c91f000 + f810832 commit 88b69f5
Show file tree
Hide file tree
Showing 10 changed files with 80 additions and 67 deletions.
16 changes: 8 additions & 8 deletions .config/mkdocs/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .config/mkdocs/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ readme = "README.md"

[tool.poetry.dependencies]
python = "^3.10"
mkdocs-material = {git = "https://github.com/squidfunk/mkdocs-material-insiders.git", rev = "9.5.49-insiders-4.53.14"}
mkdocs-material = {git = "https://github.com/squidfunk/mkdocs-material-insiders.git", rev = "9.6.1-insiders-4.53.15"}
mkdocs-git-revision-date-localized-plugin = "^1.3.0"
pymdown-extensions = "^10.14"

Expand Down
10 changes: 5 additions & 5 deletions .config/remark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"remark-lint-checkbox-character-style": "^5.0.0",
"remark-lint-checkbox-content-indent": "^5.0.0",
"remark-lint-code-block-style": "^3.1.2",
"remark-lint-definition-case": "^4.0.0",
"remark-lint-definition-case": "^4.0.1",
"remark-lint-definition-spacing": "^4.0.0",
"remark-lint-emphasis-marker": "^4.0.0",
"remark-lint-fenced-code-flag": "^4.0.0",
Expand Down Expand Up @@ -53,12 +53,12 @@
"remark-lint-no-shortcut-reference-link": "^3.1.2",
"remark-lint-no-table-indentation": "^5.0.0",
"remark-lint-no-tabs": "^3.1.2",
"remark-lint-no-undefined-references": "^5.0.0",
"remark-lint-no-unused-definitions": "^4.0.0",
"remark-lint-ordered-list-marker-style": "^4.0.0",
"remark-lint-no-undefined-references": "^5.0.1",
"remark-lint-no-unused-definitions": "^4.0.1",
"remark-lint-ordered-list-marker-style": "^4.0.1",
"remark-lint-ordered-list-marker-value": "^4.0.0",
"remark-lint-rule-style": "^4.0.0",
"remark-lint-strong-marker": "^4.0.0",
"remark-lint-strong-marker": "^4.0.1",
"remark-lint-table-cell-padding": "^5.0.0",
"remark-lint-table-pipe-alignment": "^4.0.0",
"remark-lint-table-pipes": "^4.1.2",
Expand Down
40 changes: 20 additions & 20 deletions .config/remark/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1935,10 +1935,10 @@ remark-lint-code-block-style@^4.0.0:
unist-util-visit-parents "^6.0.0"
vfile-message "^4.0.0"

remark-lint-definition-case@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/remark-lint-definition-case/-/remark-lint-definition-case-4.0.0.tgz#28048d2e75c890bd18e6cc6f7bb9a0e29783566b"
integrity sha512-XBmMmj8ii0KZUuJf7ZaVXDGp2+DWE02re9qn/6mV23rBpsDmpz7U1lQWRlwFQIE5q5bxIxP5pX7hDeTH0Egy9Q==
remark-lint-definition-case@^4.0.0, remark-lint-definition-case@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/remark-lint-definition-case/-/remark-lint-definition-case-4.0.1.tgz#e553ada8d8dc0b5900ccc563118c5ecda9ce1c78"
integrity sha512-BItJMeXyEBKW/beM7gFLMt3flnyNoRDd8yNFq+7pIeFjO7KWGRxBWUaNgk/tFEPyQcGeCqrNS3nS0ic7qi7I2w==
dependencies:
"@types/mdast" "^4.0.0"
mdast-util-phrasing "^4.0.0"
Expand Down Expand Up @@ -2514,10 +2514,10 @@ remark-lint-no-tabs@^3.1.2:
unified-lint-rule "^2.0.0"
vfile-location "^4.0.0"

remark-lint-no-undefined-references@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/remark-lint-no-undefined-references/-/remark-lint-no-undefined-references-5.0.0.tgz#2155f00a95b793ecac1921f7b45ce7c5d6087256"
integrity sha512-O0q8bHpRHK1T85oqO+uep4BkvQnZZp3y+wahDeeLLq9dCJfF56sq6Tt5OOTt1BAOZlpobS3OPQHUiJWYP6hX1w==
remark-lint-no-undefined-references@^5.0.0, remark-lint-no-undefined-references@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/remark-lint-no-undefined-references/-/remark-lint-no-undefined-references-5.0.1.tgz#69183bf73cc37bb8281dddb9283f77e8eaa9af46"
integrity sha512-j3qOk+jry1NPNbUmydGJpfbo1LeuZkvXOwr8ocxh1ymDzHf2GMCiToAiicDNaOuG85RkiIzLvnnCV5I7Mo5q8w==
dependencies:
"@types/mdast" "^4.0.0"
collapse-white-space "^2.0.0"
Expand All @@ -2528,20 +2528,20 @@ remark-lint-no-undefined-references@^5.0.0:
unist-util-visit-parents "^6.0.0"
vfile-location "^5.0.0"

remark-lint-no-unused-definitions@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/remark-lint-no-unused-definitions/-/remark-lint-no-unused-definitions-4.0.0.tgz#fc7f715d084283ca8b3a3c2e7b6afe87ace9765e"
integrity sha512-YCZ6k575NCTx7mnN+9ls0G6YgMsZHi0LYQqfLW8MNVHBtbpTBvfmk8I39bmsvuKWeBD98weZoXSDqIiIGg+Q/g==
remark-lint-no-unused-definitions@^4.0.0, remark-lint-no-unused-definitions@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/remark-lint-no-unused-definitions/-/remark-lint-no-unused-definitions-4.0.1.tgz#0b2b5761c87761c4c9c72ec9c6f2e72b5deb3df4"
integrity sha512-AdMbaCeMpj32HvDUuyI+bQyu/405Nby/rgFW8XDpI7U7ufPhHl+jj9J4NgeW7Z8DrODGr0iFgPNt6JtNLskFdA==
dependencies:
"@types/mdast" "^4.0.0"
devlop "^1.0.0"
unified-lint-rule "^3.0.0"
unist-util-visit "^5.0.0"

remark-lint-ordered-list-marker-style@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-4.0.0.tgz#9a6e8867484ec3edf8ec85699e5cca6a11163102"
integrity sha512-xZ7Xppy5fzACH4b9h1b4lTzVtNY2AlUkNTfl1Oe6cIKN8tk3juFxN0wL2RpktPtSZ7iRIabzFmg6l8WPhlASJA==
remark-lint-ordered-list-marker-style@^4.0.0, remark-lint-ordered-list-marker-style@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-4.0.1.tgz#d93dddd490a3b823c0e9c0e9d961b5032f2f4c19"
integrity sha512-vZTAbstcBPbGwJacwldGzdGmKwy5/4r29SZ9nQkME4alEl5B1ReSBlYa8t7QnTSW7+tqvA9Sg71RPadgAKWa4w==
dependencies:
"@types/mdast" "^4.0.0"
mdast-util-phrasing "^4.0.0"
Expand Down Expand Up @@ -2577,10 +2577,10 @@ remark-lint-rule-style@^4.0.0:
unist-util-visit-parents "^6.0.0"
vfile-message "^4.0.0"

remark-lint-strong-marker@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/remark-lint-strong-marker/-/remark-lint-strong-marker-4.0.0.tgz#bbaae75846ccea9753a2f6935d1fb9a3114b9461"
integrity sha512-YcvuzakYhQWdCH+1E30sUY+wyvq+PNa77NZAMAYO/cS/pZczFB+q4Ccttw4Q+No/chX8oMfe0GYtm8dDWLei/g==
remark-lint-strong-marker@^4.0.0, remark-lint-strong-marker@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/remark-lint-strong-marker/-/remark-lint-strong-marker-4.0.1.tgz#78f5001a492bae6cdc76fa71fbb8718dd6838d86"
integrity sha512-KaGtj/OWEP4eoafevnlp3NsEVwC7yGEjBJ6uFMzfjNoXyjATdfZ2euB/AfKVt/A/FdZeeMeVoAUFH4DL+hScLQ==
dependencies:
"@types/mdast" "^4.0.0"
unified-lint-rule "^3.0.0"
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ repos:
args:
- "--config=.config/pre-commit-search-and-replace.yaml"
- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
rev: v2.4.1
hooks:
- id: codespell
types: [markdown]
Expand Down
26 changes: 26 additions & 0 deletions common-practices-tools/contribution/contrib-first.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,29 @@ It is a best practice to consider first if we are building something that could
- [Vertex AI Search](https://www.drupal.org/project/vertex_ai_search)

See more of [CivicActions Drupal contributions](https://drupal.org/civicactions).

## Frequently Asked Questions

<!--lint disable maximum-heading-length-->

### Does building by Contrib First cost more?

Not typically. There are three significant offsets that make Contrib First the more affordable option:

1. Having Open Source community members also work on "feature requests" that are defined during the build process can take advantage of cost free work.
2. Custom code required custom tests that run on the project's infrastructure, while contributed code has tests that run on the contributed framework hosting.
3. If one agency has built it, other agencies don't have pay to build it.

### Does contributed code cost more to maintain?

Generally speaking, no it does not cost more. In total cost of ownership, contributed code is less expensive to maintain than custom code. Contributed code usually gets updated by update bots when there are changes needed. They make issues and merge requests automatically. The same code existing as custom code has to be updated by project personnel when the need for a change is discovered. In addition, with a broader user base, Open Source community members are more likely to uncover bugs or inefficiencies and provide improvements.

### How de we decide between what is worth contributing and what is too specific to a project to have more general appeal?

Our engineers are pretty good at recognizing opportunities to re-use their work across multiple projects. This is especially true in the Government sector where agencies often have similar requirements. If we have even a hint that multiple agencies could benefit, we build it as contributed code first. If it starts out as something so specific to a given project that it can no be generalized, the we build it as custom code for that project. However we continually re-evaluate our custom code to see if, over time, it has become something that is worth contributing.

### Does developing by Contrib First take longer?

In our practice, marginally. Largely the increase comes in specifying the bite sized issues on the Open Source issue queue. If following [good Contrib First development practices](../../practice-areas/engineering/drupal/drupal-contrib-first-module-development.md) small bite sized issues take a little longer to write, but they greatly increases the chance that a community member will grab the ticket and work on it. On our recent build of the Alt Text Validation module 10 out of the first 37 commits (27%) came from community members.

<!--lint enable maximum-heading-length-->
6 changes: 2 additions & 4 deletions company-policies/anti-harassment-policies.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ updated: June 22, 2018

# Policy Against Proscribed Harassment and Discrimination

_This policy was taken directly from the TriNet handbook as of June 2018._

<!--- Protected classes from Trinet handbook, keep list updated in: employment, code-of-conduct and anti-harassment-policies -->
<!--- List of officials to contact should be updated when this policy is updated from Trinet's version -->

Expand Down Expand Up @@ -39,9 +37,9 @@ Proscribed harassment can occur in one-on-one interactions or in group settings

## Reporting and Investigating Proscribed Harassment

If you believe anyone is harassing you based on a protected characteristic, or harassing another individual in the workplace, we encourage you, if comfortable doing so, to tell the harasser in clear language that the behaviors or advances are unwelcome or unwanted and must stop. The individual may not realize the behavior is objectionable and a simple communication may effectively end the behavior. However, if you are not comfortable engaging in such communication or the behavior does not stop following such communication, you should immediately report your concern to your manager, any other company manager or official (Elizabeth Raley, Alaine Karoleff, Marc Jones, or other who you feel comfortable speaking with), your TriNet HR Representative or the TriNet Solution Center. Report the facts of the incident, including what happened, when, where, how often, and the names of the accused and any witnesses. Managers should immediately report any suspected incidents of harassment of others to a TriNet HR Representative.
If you believe anyone is harassing you based on a protected characteristic, or harassing another individual in the workplace, we encourage you, if comfortable doing so, to tell the harasser in clear language that the behaviors or advances are unwelcome or unwanted and must stop. The individual may not realize the behavior is objectionable and a simple communication may effectively end the behavior. However, if you are not comfortable engaging in such communication or the behavior does not stop following such communication, you should immediately report your concern to your manager, the PeopleOps Team, any other company manager or official (Elizabeth Raley, Alaine Karoleff, or other who you feel comfortable speaking with). Report the facts of the incident, including what happened, when, where, how often, and the names of the accused and any witnesses. Managers should immediately report any suspected incidents of harassment of others to the PeopleOps Team.
All claims of proscribed harassment will be investigated in a timely, objective, and thorough manner as confidentially as possible. All employees are expected to cooperate fully in any investigation. If it is determined that prohibited harassment has occurred, the appropriate corrective action, up to and including termination of employment of the offending employee, will be taken along with any additional steps necessary to prevent further violations of this policy.

## Protection against Retaliation

Neither the company nor the law will tolerate any form of retaliation against any employee who opposes discrimination or prohibited harassment, makes a complaint, or participates in any manner in an internal investigation or an investigation, proceeding, or hearing conducted by a state or federal agency or court. If you believe that you have experienced or witnessed retaliation, you should immediately report your concern to your manager, any other manager or officer, a TriNet HR Representative or the TriNet Solution Center. Any employee who engages in retaliation will be subject to disciplinary action, up to and including termination of employment, as well as possible legal consequences.
Neither the company nor the law will tolerate any form of retaliation against any employee who opposes discrimination or prohibited harassment, makes a complaint, or participates in any manner in an internal investigation or an investigation, proceeding, or hearing conducted by a state or federal agency or court. If you believe that you have experienced or witnessed retaliation, you should immediately report your concern to your manager, the PeopleOps Team, any other manager or officer. Any employee who engages in retaliation will be subject to disciplinary action, up to and including termination of employment, as well as possible legal consequences.
25 changes: 1 addition & 24 deletions practice-areas/engineering/drupal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,27 +44,4 @@ CivicActions engineers all strive to be very helpful, so it's rare for a questio

## Contributions to drupal.org

We strongly encourage all CivicActioners to look for opportunities to give back to the Drupal community. To track contributions follow the instructions below. Tracking community contributions helps our Practice Area see and appreciate your contributions. It also helps our organization as a whole!

### Update your drupal.org profile

- Go to <https://drupal.org/>.
- Log into your drupal.org account (create one if you do not have one).
- Align it with CivicActions in the "Work" section: Edit profile > Then expand the Work section > Type in "CivicActions" and your Job title.
- Align your role with CivicActions in the "[Contributor roles](https://www.drupal.org/community/contributor-guide/find-your-role)" section: Edit profile > Then expand the Contributor roles section > Type in "CivicActions" in "Organization support".

### Contribution to drupal.org modules and themes

If you have created or are creating a module or a theme and use CivicActions time to work on it — either for a client or as professional development/community participation time — please make sure to add CivicActions under "Supporting organizations" when editing the module or theme. An example screenshot of what the checkbox looks like:

![Supporting organizations field screenshot seen in Drupal.org module and theme edit forms](../../../assets/images/drupal-pa-support-org-screenshot.png)

Adding the organization will ensure that the module and theme will also be attributed to CivicActions. Examples of that can be seen under [CivicActions Drupal profile page](https://www.drupal.org/civicactions#projects-supported).

### Contributing to drupal.org issues

If you are contributing to drupal.org issues for CivicActions and our customers, please make sure to click the box under "Attribute this contribution". An example screenshot of what the checkbox looks like:

![Attribute this contribution field screenshot seen in Drupal.org issue comment forms](../../../assets/images/drupal-pa-contribution-attribution-screenshot.png)

Checking the box and adding the organization and customer will ensure that any credit you receive will also be attributed to CivicActions and the customer. Examples of that can be seen under [CivicActions Drupal profile page](https://www.drupal.org/civicactions#org-page-issue-credit).
Review [Contribution to drupal.org modules and themes](./drupal-for-drupal-engineers.md#contribution-to-drupalorg-modules-and-themes).
Loading

0 comments on commit 88b69f5

Please sign in to comment.