diff options
author | José Valim <jose.valim@gmail.com> | 2009-06-27 21:27:21 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-06-27 21:27:21 +0200 |
commit | 85ff67ce4c0e95de9b855af7f7e7fbab7f7726de (patch) | |
tree | 3eb1914ed2ac7261405df22015fc4b33578bbe3c /railties/test/initializer/root | |
parent | e375819b76ac04bc60fd516b15bbe42c093eb547 (diff) | |
parent | 085db5e128ad4ad8fd042776722c78e194c6d0a4 (diff) | |
download | rails-85ff67ce4c0e95de9b855af7f7e7fbab7f7726de.tar.gz rails-85ff67ce4c0e95de9b855af7f7e7fbab7f7726de.tar.bz2 rails-85ff67ce4c0e95de9b855af7f7e7fbab7f7726de.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/test/initializer/root')
-rw-r--r-- | railties/test/initializer/root/app/controllers/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/app/helpers/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/app/metal/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/app/models/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/app/views/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/config/database.yml | 4 | ||||
-rw-r--r-- | railties/test/initializer/root/config/environments/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/config/locales/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/config/routes.rb | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/lib/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/tmp/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/tmp/cache/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/vendor/.keep | 0 |
13 files changed, 4 insertions, 0 deletions
diff --git a/railties/test/initializer/root/app/controllers/.keep b/railties/test/initializer/root/app/controllers/.keep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/test/initializer/root/app/controllers/.keep diff --git a/railties/test/initializer/root/app/helpers/.keep b/railties/test/initializer/root/app/helpers/.keep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/test/initializer/root/app/helpers/.keep diff --git a/railties/test/initializer/root/app/metal/.keep b/railties/test/initializer/root/app/metal/.keep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/test/initializer/root/app/metal/.keep diff --git a/railties/test/initializer/root/app/models/.keep b/railties/test/initializer/root/app/models/.keep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/test/initializer/root/app/models/.keep diff --git a/railties/test/initializer/root/app/views/.keep b/railties/test/initializer/root/app/views/.keep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/test/initializer/root/app/views/.keep diff --git a/railties/test/initializer/root/config/database.yml b/railties/test/initializer/root/config/database.yml new file mode 100644 index 0000000000..ce3356be0c --- /dev/null +++ b/railties/test/initializer/root/config/database.yml @@ -0,0 +1,4 @@ +development: + adapter: sqlite3 + database: db/railties.db + timeout: 5000
\ No newline at end of file diff --git a/railties/test/initializer/root/config/environments/.keep b/railties/test/initializer/root/config/environments/.keep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/test/initializer/root/config/environments/.keep diff --git a/railties/test/initializer/root/config/locales/.keep b/railties/test/initializer/root/config/locales/.keep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/test/initializer/root/config/locales/.keep diff --git a/railties/test/initializer/root/config/routes.rb b/railties/test/initializer/root/config/routes.rb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/test/initializer/root/config/routes.rb diff --git a/railties/test/initializer/root/lib/.keep b/railties/test/initializer/root/lib/.keep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/test/initializer/root/lib/.keep diff --git a/railties/test/initializer/root/tmp/.keep b/railties/test/initializer/root/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/test/initializer/root/tmp/.keep diff --git a/railties/test/initializer/root/tmp/cache/.keep b/railties/test/initializer/root/tmp/cache/.keep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/test/initializer/root/tmp/cache/.keep diff --git a/railties/test/initializer/root/vendor/.keep b/railties/test/initializer/root/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/test/initializer/root/vendor/.keep |