aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2017-07-28 06:18:43 +0000
committerJeremy Daer <jeremydaer@gmail.com>2018-02-17 14:26:19 -0800
commit0f98954a83a5ec1d7c8def958422a62f0ead59a1 (patch)
treeae962382204a40d7c76c7204358f5d7b7e0c4a46 /actionview
parent5645149d3a27054450bd1130ff5715504638a5f5 (diff)
downloadrails-0f98954a83a5ec1d7c8def958422a62f0ead59a1.tar.gz
rails-0f98954a83a5ec1d7c8def958422a62f0ead59a1.tar.bz2
rails-0f98954a83a5ec1d7c8def958422a62f0ead59a1.zip
Clean up and consolidate .gitignores
* Global ignores at toplevel .gitignore * Component-specific ignores in each toplevel directory * Remove `actionview/test/tmp/.keep` for JRuby ``` rm actionview/test/tmp/ -fr cd actionview/ bundle exec jruby -Itest test/template/digestor_test.rb ``` Related to #11743, #30392. Closes #29978.
Diffstat (limited to 'actionview')
-rw-r--r--actionview/.gitignore7
-rw-r--r--actionview/test/fixtures/public/.gitignore1
-rw-r--r--actionview/test/tmp/.keep0
-rw-r--r--actionview/test/ujs/.gitignore1
4 files changed, 5 insertions, 4 deletions
diff --git a/actionview/.gitignore b/actionview/.gitignore
index 0a04b29786..246aabbb7f 100644
--- a/actionview/.gitignore
+++ b/actionview/.gitignore
@@ -1,2 +1,5 @@
-/lib/assets/compiled
-/tmp
+/lib/assets/compiled/
+/log/
+/test/fixtures/public/absolute/
+/test/ujs/log/
+/tmp/
diff --git a/actionview/test/fixtures/public/.gitignore b/actionview/test/fixtures/public/.gitignore
deleted file mode 100644
index 312e635ee6..0000000000
--- a/actionview/test/fixtures/public/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-absolute/*
diff --git a/actionview/test/tmp/.keep b/actionview/test/tmp/.keep
deleted file mode 100644
index e69de29bb2..0000000000
--- a/actionview/test/tmp/.keep
+++ /dev/null
diff --git a/actionview/test/ujs/.gitignore b/actionview/test/ujs/.gitignore
deleted file mode 100644
index 31dbbff57c..0000000000
--- a/actionview/test/ujs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/log