From 6ebbaaa7fabeedaa2d668d2274ee323d77cc0de9 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 12 Oct 2016 23:24:02 +0200 Subject: Update gitignore rules --- data/.gitignore | 10 +++------- data/PubSubHubbub/feeds/.gitignore | 3 ++- data/users/.gitignore | 9 +++++---- 3 files changed, 10 insertions(+), 12 deletions(-) (limited to 'data') diff --git a/data/.gitignore b/data/.gitignore index c2ed350a6..76314fc12 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -1,10 +1,6 @@ -application.ini config.php -*.sqlite -touch.txt -no-cache.txt -*.bak.php -*.lock.txt +config.php.bak.php +force-https.txt last_update.txt +no-cache.txt update.php -force-https.txt diff --git a/data/PubSubHubbub/feeds/.gitignore b/data/PubSubHubbub/feeds/.gitignore index 150f68c80..16b0ae4bc 100644 --- a/data/PubSubHubbub/feeds/.gitignore +++ b/data/PubSubHubbub/feeds/.gitignore @@ -1 +1,2 @@ -*/* +*/*.json +*/*.txt diff --git a/data/users/.gitignore b/data/users/.gitignore index a8b7cd60f..3705c06b7 100644 --- a/data/users/.gitignore +++ b/data/users/.gitignore @@ -1,4 +1,5 @@ -db.sqlite -config.php -log*.txt - +*/ +*/config.php +*/db.sqlite +!_/ +*/log*.txt -- cgit v1.2.3 From 2ac71f2bd683bae06f1e4056e2893d74cf4ad430 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 15 Oct 2016 13:37:21 +0200 Subject: Readme gitignore --- CHANGELOG.md | 1 + data/PubSubHubbub/feeds/.gitignore | 1 + 2 files changed, 2 insertions(+) (limited to 'data') diff --git a/CHANGELOG.md b/CHANGELOG.md index 3178e6ae7..a2d938436 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ * Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264) * Security * Prevent `` attacks with `window.opener` [#1245](https://github.com/FreshRSS/FreshRSS/issues/1245) + * Updated gitignore rules to keep user directories during a `git clean -f -d` [#1307](https://github.com/FreshRSS/FreshRSS/pull/1307) * UI * Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236) * Extensions diff --git a/data/PubSubHubbub/feeds/.gitignore b/data/PubSubHubbub/feeds/.gitignore index 16b0ae4bc..d8f9df042 100644 --- a/data/PubSubHubbub/feeds/.gitignore +++ b/data/PubSubHubbub/feeds/.gitignore @@ -1,2 +1,3 @@ +*/ */*.json */*.txt -- cgit v1.2.3