Merge branch 'master' into devel

2022-06-03 16:01:25 +02:00 · 2022-06-03 16:01:25 +02:00 · 935d192197
commit 935d192197
parent cd07911891 8dd5783bec
8 changed files with 6 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,3 @@
 /redmine_dmsf.iml
-/test/fixtures/files/**
-!/test/fixtures/files/2017/**
 Gemfile.lock
-.history
+.history
--- a/test/fixtures/files/2017/04/deleted.txt
+++ b/test/fixtures/files/2017/04/deleted.txt
@ -0,0 +1 @@
+123
--- a/test/fixtures/files/2017/04/test.mp4
+++ b/test/fixtures/files/2017/04/test.mp4
@ -0,0 +1 @@
+123
--- a/test/fixtures/files/2017/04/test.odt
+++ b/test/fixtures/files/2017/04/test.odt
--- a/test/fixtures/files/2017/04/test2.txt
+++ b/test/fixtures/files/2017/04/test2.txt
@ -0,0 +1 @@
+123
--- a/test/fixtures/files/2017/04/test4.txt
+++ b/test/fixtures/files/2017/04/test4.txt
@ -0,0 +1 @@
+123
--- a/test/fixtures/files/2017/04/test5.txt
+++ b/test/fixtures/files/2017/04/test5.txt
@ -0,0 +1 @@
+123
--- a/test/fixtures/files/2017/04/zero.txt
+++ b/test/fixtures/files/2017/04/zero.txt