Skip to content

Commit fd440ba

Browse files
committed
Merge branch 'main' into SECURITY_metadata_options
2 parents 98355be + 1bc865a commit fd440ba

24 files changed

+886
-769
lines changed

.circleci/gpg.private.enc

0 Bytes
Binary file not shown.

.envrc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,11 @@
33
PROJECT_DIR="$(pwd)"
44

55
PATH_add "${PROJECT_DIR}"
6-
PATH_add "${PROJECT_DIR}"/vendor/terraform/bin
6+
PATH_add "${PROJECT_DIR}"/vendor/**/bin
7+
8+
if has asdf; then
9+
asdf install
10+
fi
11+
12+
layout ruby
13+
layout node
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ build/
1414
dist/
1515
.bundle
1616
.rakeTasks
17+
.direnv
1718

1819
# OS
1920
.DS_Store

.tool-versions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ruby 3.1.1

CODE_OF_CONDUCT.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ Project maintainers are responsible for clarifying the standards of acceptable
3737
behavior and are expected to take appropriate and fair corrective action in
3838
response to any instances of unacceptable behavior.
3939

40-
Project maintainers have the right and responsibility to remove, edit, or
41-
reject comments, commits, code, wiki edits, issues, and other contributions
42-
that are not aligned to this Code of Conduct, or to ban temporarily or
43-
permanently any contributor for other behaviors that they deem inappropriate,
44-
threatening, offensive, or harmful.
40+
Project maintainers have the right and responsibility to remove, edit, or reject
41+
comments, commits, code, wiki edits, issues, and other contributions that are
42+
not aligned to this Code of Conduct, or to ban temporarily or permanently any
43+
contributor for other behaviors that they deem inappropriate, threatening,
44+
offensive, or harmful.
4545

4646
## Scope
4747

@@ -72,4 +72,5 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage],
7272
version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
7373

7474
[homepage]: http://contributor-covenant.org
75-
[version]: http://contributor-covenant.org/version/1/4/
75+
76+
[version]: http://contributor-covenant.org/version/1/4/

0 commit comments

Comments
 (0)