Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
MikeMcQuaid authored Apr 19, 2022
2 parents 833b919 + 8f2c8ef commit 96342ef
Show file tree
Hide file tree
Showing 32 changed files with 92 additions and 402 deletions.
40 changes: 10 additions & 30 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,12 @@
version: 2
updates:
- package-ecosystem: bundler
directory: "/"
schedule:
interval: daily
time: "10:00"
timezone: Europe/Vienna
pull-request-branch-name:
separator: "-"
open-pull-requests-limit: 99
rebase-strategy: disabled
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
time: "10:00"
timezone: Europe/Vienna
pull-request-branch-name:
separator: "-"
open-pull-requests-limit: 99
rebase-strategy: disabled
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "10:00"
timezone: Europe/Vienna
pull-request-branch-name:
separator: "-"
open-pull-requests-limit: 99
rebase-strategy: disabled
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "10:00"
timezone: Europe/Vienna
pull-request-branch-name:
separator: "-"
open-pull-requests-limit: 99
rebase-strategy: disabled
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ bin
css/main.scss
test/node_modules
test/package-lock.json
Gemfile.lock
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12.14.0
297 changes: 0 additions & 297 deletions Gemfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion _articles/best-practices.md
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ Just like any other type of work, taking regular breaks will keep you refreshed,
<img src="https://avatars.githubusercontent.com/danielbachhuber?s=180" class="pquote-avatar" alt="avatar">
In maintaining WP-CLI, I've discovered I need to make myself happy first, and set clear boundaries on my involvement. The best balance I've found is 2-5 hours per week, as a part of my normal work schedule. This keeps my involvement a passion, and from feeling too much like work. Because I prioritize the issues I'm working on, I can make regular progress on what I think is most important.
<p markdown="1" class="pquote-credit">
@danielbachhuber, ["My condolences, you're now the maintainer of a popular open source project"](https://danielbachhuber.com/2016/06/26/my-condolences-youre-now-the-maintainer-of-a-popular-open-source-project/)
@danielbachhuber, ["My condolences, you're now the maintainer of a popular open source project"](https://web.archive.org/web/20220306014037/https://danielbachhuber.com/2016/06/26/my-condolences-youre-now-the-maintainer-of-a-popular-open-source-project/)
</p>
</aside>

Expand Down
2 changes: 1 addition & 1 deletion _articles/de/best-practices.md
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ Genau wie bei jeder anderen Art von Arbeit, werden Sie durch regelmäßige Pause
_In maintaining WP-CLI, I've discovered I need to make myself happy first, and set clear boundaries on my involvement. The best balance I've found is 2-5 hours per week, as a part of my normal work schedule. This keeps my involvement a passion, and from feeling too much like work. Because I prioritize the issues I'm working on, I can make regular progress on what I think is most important._

<p markdown="1" class="pquote-credit">
@danielbachhuber, ["My condolences, you're now the maintainer of a popular open source project"](https://danielbachhuber.com/2016/06/26/my-condolences-youre-now-the-maintainer-of-a-popular-open-source-project/)
@danielbachhuber, ["My condolences, you're now the maintainer of a popular open source project"](https://web.archive.org/web/20220306014037/https://danielbachhuber.com/2016/06/26/my-condolences-youre-now-the-maintainer-of-a-popular-open-source-project/)
</p>
</aside>

Expand Down
2 changes: 1 addition & 1 deletion _articles/es/best-practices.md
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ Al igual que cualquier otro tipo de trabajo, tomar pausas regulares te mantendr&
<img src="https://avatars.githubusercontent.com/danielbachhuber?s=180" class="pquote-avatar" alt="avatar">
Durante el mantenimiento de WP-CLI, descubr&iacute; que tengo que preocuparme por mi felicidad primero, y establecer l&iacute;mites claros en mi participaci&oacute;n. El mejor equilibrio que he encontrado es 2-5 horas por semana, como parte de mi horario de trabajo normal. Esto mantiene mi participaci&oacute;n una pasi&oacute;n, y de sentirse demasiado como el trabajo. Como priorizo ​​las issues en las que estoy trabajando, puedo hacer progresos regulares en lo que creo que es lo m&aacute;s importante.
<p markdown="1" class="pquote-credit">
@danielbachhuber, ["Mis condolencias, ahora eres el mantenedor de un proyecto de c&oacute;digo abierto popular"](https://danielbachhuber.com/2016/06/26/my-condolences-youre-now-the-maintainer-of-a-popular-open-source-project/)
@danielbachhuber, ["Mis condolencias, ahora eres el mantenedor de un proyecto de c&oacute;digo abierto popular"](https://web.archive.org/web/20220306014037/https://danielbachhuber.com/2016/06/26/my-condolences-youre-now-the-maintainer-of-a-popular-open-source-project/)
</p>
</aside>

Expand Down
4 changes: 2 additions & 2 deletions _articles/es/legal.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Finalmente, tu proyecto puede tener dependencias con requisitos de licencia que

## ¿Son p&uacute;blicos los proyectos de c&oacute;digo abierto de GitHub?

Cuando t&uacute; [creas un nuevo proyecto](https://help.GitHub.com/articles/creating-a-new-repository/) en GitHub, tienes la opci&oacute;n de hacerlo **privado** o **p&uacute;blico**.
Cuando t&uacute; [creas un nuevo proyecto](https://help.github.com/articles/creating-a-new-repository/) en GitHub, tienes la opci&oacute;n de hacerlo **privado** o **p&uacute;blico**.

![crear repositorio](/assets/images/legal/repo-create-name.png)

Expand All @@ -42,7 +42,7 @@ Tienes suerte, porque hoy, las licencias de c&oacute;digo abierto est&aacute;n e

[MIT](https://choosealicense.com/licenses/mit/), [Apache 2.0](https://choosealicense.com/licenses/apache-2.0/), y [GPLv3](https://choosealicense.com/licenses/gpl-3.0/) son las licencias de c&oacute;digo abierto m&aacute;s populares, pero tambi&eacute;n tienes otras opciones para elegir. Puedes encontrar un texto completo sobre estas licencias, e instrucciones de uso de las mismas en [choosealicense.com](https://choosealicense.com/).

Cuando crees un nuevo proyecto en GitHub, se te [pedir&aacute; que agregues una licencia](https://help.GitHub.com/articles/open-source-licensing/).
Cuando crees un nuevo proyecto en GitHub, se te [pedir&aacute; que agregues una licencia](https://help.github.com/articles/open-source-licensing/).

<aside markdown="1" class="pquote">
<img src="https://avatars.githubusercontent.com/benbalter?s=180" class="pquote-avatar" alt="avatar">
Expand Down
Loading

0 comments on commit 96342ef

Please sign in to comment.