From 665f162bc0b630055758c8241469742bc23cf319 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 13 Apr 2024 01:26:08 +0200 Subject: [PATCH 1/4] Add `/public/assets/img/webpack` to ignore files again --- .dockerignore | 3 +++ .gitignore | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.dockerignore b/.dockerignore index b299c7313d05d..9bc9a9593963c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -95,6 +95,9 @@ cpu.out /.air /.go-licenses +# Folders that previously existed +/public/assets/img/webpack + # Snapcraft snap/.snapcraft/ parts/ diff --git a/.gitignore b/.gitignore index 501fef7dcf888..0efac91102a7f 100644 --- a/.gitignore +++ b/.gitignore @@ -94,6 +94,9 @@ cpu.out /.air /.go-licenses +# Folders that previously existed +/public/assets/img/webpack + # Snapcraft /gitea_a*.txt snap/.snapcraft/ From 2aacfe4abff8a92b3ad70c595c50a0fa72ad9f11 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 13 Apr 2024 01:28:15 +0200 Subject: [PATCH 2/4] improve comment --- .dockerignore | 2 +- .gitignore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 9bc9a9593963c..313ac2fe22913 100644 --- a/.dockerignore +++ b/.dockerignore @@ -95,7 +95,7 @@ cpu.out /.air /.go-licenses -# Folders that previously existed +# Files and folders that previously existed /public/assets/img/webpack # Snapcraft diff --git a/.gitignore b/.gitignore index 0efac91102a7f..2e44e96a69b3f 100644 --- a/.gitignore +++ b/.gitignore @@ -94,7 +94,7 @@ cpu.out /.air /.go-licenses -# Folders that previously existed +# Files and folders that previously existed /public/assets/img/webpack # Snapcraft From 932fa8c28bd28e51eb91fde8b70d67acee57227f Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 13 Apr 2024 02:51:11 +0200 Subject: [PATCH 3/4] Update .dockerignore --- .dockerignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 313ac2fe22913..b696e1603cca7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -95,7 +95,7 @@ cpu.out /.air /.go-licenses -# Files and folders that previously existed +# Files and folders that were previously generated /public/assets/img/webpack # Snapcraft From 7de0ec65e0252c77747d538239b65eb3e1fc0cf8 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 13 Apr 2024 02:51:24 +0200 Subject: [PATCH 4/4] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2e44e96a69b3f..46c8b9b49c9af 100644 --- a/.gitignore +++ b/.gitignore @@ -94,7 +94,7 @@ cpu.out /.air /.go-licenses -# Files and folders that previously existed +# Files and folders that were previously generated /public/assets/img/webpack # Snapcraft