summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-04-25 11:44:53 +0200
committerWinnie Hellmann <winnie@gitlab.com>2019-05-02 23:11:12 +0200
commit5990d42253b2b99dc5a699df81f0e0f976844c49 (patch)
tree0001896760e1d098df8c489fa714a808194b22ce
parentacaef5e35b9519b5e4ebcefee274e8c8f3d8c85a (diff)
downloadgitlab-ce-5990d42253b2b99dc5a699df81f0e0f976844c49.tar.gz
Ignore PDF and balsamiq fixture files
(cherry picked from commit 1b33828811897b6a3f8a38044cc0839b87098d1f)
-rw-r--r--.gitignore2
-rw-r--r--spec/javascripts/fixtures/.gitignore2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 0696dd217af..627c806787b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,8 +59,6 @@ eslint-report.html
/public/uploads.*
/public/uploads/
/shared/artifacts/
-/spec/javascripts/fixtures/blob/pdf/
-/spec/javascripts/fixtures/blob/balsamiq/
/rails_best_practices_output.html
/tags
/tmp/*
diff --git a/spec/javascripts/fixtures/.gitignore b/spec/javascripts/fixtures/.gitignore
index 2507c8e7263..bed020f5b0a 100644
--- a/spec/javascripts/fixtures/.gitignore
+++ b/spec/javascripts/fixtures/.gitignore
@@ -1,3 +1,5 @@
*.html.raw
*.html
*.json
+*.pdf
+*.bmpr