aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures/public
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-06-26 11:58:02 +0200
committerJosé Valim <jose.valim@gmail.com>2009-06-26 11:58:02 +0200
commit915f108d6a47b9c29e11ebe0b140ef017eb015b0 (patch)
treeae0c42330a9fbdc8395f8a5bae4605ef455c18c1 /actionpack/test/fixtures/public
parentaee63a12f2cfd110725c74686ae1eed58e18fda7 (diff)
parentb5dfdc714fab7d2836e0a979ca88b4a17db9ec06 (diff)
downloadrails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.tar.gz
rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.tar.bz2
rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/test/fixtures/public')
-rw-r--r--actionpack/test/fixtures/public/.gitignore1
-rw-r--r--actionpack/test/fixtures/public/elsewhere/cools.js1
-rw-r--r--actionpack/test/fixtures/public/elsewhere/file.css1
-rw-r--r--actionpack/test/fixtures/public/javascripts/common.javascript1
-rw-r--r--actionpack/test/fixtures/public/stylesheets/random.styles1
5 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/public/.gitignore b/actionpack/test/fixtures/public/.gitignore
new file mode 100644
index 0000000000..0c6759baec
--- /dev/null
+++ b/actionpack/test/fixtures/public/.gitignore
@@ -0,0 +1 @@
+absolute \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/elsewhere/cools.js b/actionpack/test/fixtures/public/elsewhere/cools.js
new file mode 100644
index 0000000000..6e12fe29c4
--- /dev/null
+++ b/actionpack/test/fixtures/public/elsewhere/cools.js
@@ -0,0 +1 @@
+// cools.js \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/elsewhere/file.css b/actionpack/test/fixtures/public/elsewhere/file.css
new file mode 100644
index 0000000000..6aea0733b1
--- /dev/null
+++ b/actionpack/test/fixtures/public/elsewhere/file.css
@@ -0,0 +1 @@
+/*file.css*/ \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/javascripts/common.javascript b/actionpack/test/fixtures/public/javascripts/common.javascript
new file mode 100644
index 0000000000..2ae1929056
--- /dev/null
+++ b/actionpack/test/fixtures/public/javascripts/common.javascript
@@ -0,0 +1 @@
+// common.javascript \ No newline at end of file
diff --git a/actionpack/test/fixtures/public/stylesheets/random.styles b/actionpack/test/fixtures/public/stylesheets/random.styles
new file mode 100644
index 0000000000..d4eeead95c
--- /dev/null
+++ b/actionpack/test/fixtures/public/stylesheets/random.styles
@@ -0,0 +1 @@
+/* random.styles */ \ No newline at end of file