summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-02 07:35:49 +0000
committerPhil Hughes <me@iamphill.com>2017-05-02 07:35:49 +0000
commit54beb93ac30371c978d80b03a8e0c386ca75fdb5 (patch)
tree092ced9ac8be0fd65c9bcde947bf26b3443bb11d /.gitignore
parent8100f9686dcd729f42d14e86cb9b36b403e036ac (diff)
parent9f3985c6133507ac721abbb4c19049656008ec68 (diff)
downloadgitlab-ce-54beb93ac30371c978d80b03a8e0c386ca75fdb5.tar.gz
Merge branch 'pdflab-in-repo' into 'master'
Move PDFLab assets into repo See merge request !10642
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index dfc99a4ee48..bb818213de1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@ eslint-report.html
/public/uploads.*
/public/uploads/
/shared/artifacts/
+/spec/javascripts/fixtures/blob/pdf/
/rails_best_practices_output.html
/tags
/tmp/*