aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-08-31 15:46:27 +0930
committerGitHub <noreply@github.com>2017-08-31 15:46:27 +0930
commitd81a2ede5916e1d1c0459b5981ba760d423327a2 (patch)
treeaf8de50df848ef8c539c6e43f476ca134398c094
parenteb28b9888e6b64fddcafacf75f34eae9fce9b47a (diff)
parent5206dd6d3237d9e7bac0ee2b8bd86929c76f7478 (diff)
downloadrails-d81a2ede5916e1d1c0459b5981ba760d423327a2.tar.gz
rails-d81a2ede5916e1d1c0459b5981ba760d423327a2.tar.bz2
rails-d81a2ede5916e1d1c0459b5981ba760d423327a2.zip
Merge pull request #30392 from koic/unify_source_control_keep_file_name
Unify the internal source control .keep file name
-rw-r--r--actionview/test/tmp/.keep (renamed from actionview/test/tmp/.gitkeep)0
-rw-r--r--activerecord/test/migrations/empty/.keep (renamed from activerecord/test/migrations/empty/.gitkeep)0
2 files changed, 0 insertions, 0 deletions
diff --git a/actionview/test/tmp/.gitkeep b/actionview/test/tmp/.keep
index e69de29bb2..e69de29bb2 100644
--- a/actionview/test/tmp/.gitkeep
+++ b/actionview/test/tmp/.keep
diff --git a/activerecord/test/migrations/empty/.gitkeep b/activerecord/test/migrations/empty/.keep
index e69de29bb2..e69de29bb2 100644
--- a/activerecord/test/migrations/empty/.gitkeep
+++ b/activerecord/test/migrations/empty/.keep