aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
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 /activerecord
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 'activerecord')
-rw-r--r--activerecord/.gitignore3
-rw-r--r--activerecord/examples/.gitignore1
-rw-r--r--activerecord/test/.gitignore1
-rw-r--r--activerecord/test/fixtures/.gitignore1
4 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/.gitignore b/activerecord/.gitignore
new file mode 100644
index 0000000000..884ee009eb
--- /dev/null
+++ b/activerecord/.gitignore
@@ -0,0 +1,3 @@
+/sqlnet.log
+/test/config.yml
+/test/fixtures/*.sqlite*
diff --git a/activerecord/examples/.gitignore b/activerecord/examples/.gitignore
deleted file mode 100644
index 0dfc1cb7fb..0000000000
--- a/activerecord/examples/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-performance.sql
diff --git a/activerecord/test/.gitignore b/activerecord/test/.gitignore
deleted file mode 100644
index a0ec5967dd..0000000000
--- a/activerecord/test/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/config.yml
diff --git a/activerecord/test/fixtures/.gitignore b/activerecord/test/fixtures/.gitignore
deleted file mode 100644
index 885029a512..0000000000
--- a/activerecord/test/fixtures/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.sqlite* \ No newline at end of file