summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Warren <earl-warren@noreply.codeberg.org>2024-07-28 11:56:41 +0200
committerEarl Warren <earl-warren@noreply.codeberg.org>2024-07-28 11:56:41 +0200
commit8453b563a99466c1d17246d0df9fb07c87a79970 (patch)
tree2433fbbc64c81f51cb062ca0fd2dd0695525082a
parentMerge pull request '[v7.0/forgejo] fix(api): issue state change is not idempo... (diff)
parentEnable direnv (#31672) (#31679) (diff)
downloadforgejo-8453b563a99466c1d17246d0df9fb07c87a79970.tar.xz
forgejo-8453b563a99466c1d17246d0df9fb07c87a79970.zip
Merge pull request '[gitea] week 2024-31-v7.0 cherry pick (release/v1.22 -> v7.0/forgejo)' (#4717) from earl-warren/wcp/2024-31-v7.0 into v7.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4717 Reviewed-by: thefox <thefox@noreply.codeberg.org> Reviewed-by: 0ko <0ko@noreply.codeberg.org>
-rw-r--r--.envrc1
-rw-r--r--.gitignore3
2 files changed, 4 insertions, 0 deletions
diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000000..3550a30f2d
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.gitignore b/.gitignore
index b883e079d1..ac9765d10a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,6 +113,9 @@ prime/
*_source.tar.bz2
.DS_Store
+# nix-direnv generated files
+.direnv/
+
# Make evidence files
/.make_evidence