From: Arthur <arthur@hoa.ro>
Date: Thu, 23 Jul 2015 13:45:59 +0000 (+0200)
Subject: Merge pull request #295 from Knah-Tsaeb/patch-1
X-Git-Tag: v0.5.0~2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=f22a494a1e222ff846a813d9046908c2e2c86a67;hp=bb2948c52a93129af7fd71fde87edb3c1191dbc4;p=github%2Fshaarli%2FShaarli.git

Merge pull request #295 from Knah-Tsaeb/patch-1

[fix]  #293 - Black thumbnails on picture wall after upgrade
---

diff --git a/.travis.yml b/.travis.yml
index d10311c9..80db6506 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,4 +9,5 @@ install:
   - composer self-update
   - composer install
 script:
+  - make clean
   - make test
diff --git a/Makefile b/Makefile
index 80efcfaa..28353587 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ mess_detector_summary: mess_title
 # See phpunit.xml for configuration
 # https://phpunit.de/manual/current/en/appendixes.configuration.html
 ##
-test: clean
+test:
 	@echo "-------"
 	@echo "PHPUNIT"
 	@echo "-------"
@@ -114,13 +114,13 @@ test: clean
 
 ### remove all unversioned files
 clean:
-		@git clean -df
+	@git clean -df
 
 ### update the local copy of the documentation
 doc: clean
-		@rm -rf doc
-		@git clone https://github.com/shaarli/Shaarli.wiki.git doc
-		@rm -rf doc/.git
+	@rm -rf doc
+	@git clone https://github.com/shaarli/Shaarli.wiki.git doc
+	@rm -rf doc/.git
 
 ### Convert local markdown documentation to HTML
 htmldoc: