From 367cdaa74e49e8f85d7ac2be820a558b3974666c Mon Sep 17 00:00:00 2001
From: Dan Rice <drice@diego>
Date: Wed, 26 Sep 2012 22:07:08 -0400
Subject: [PATCH 1/3] remove obsolete /log.tmpl

---
 log.tmpl/apache.log      | 0
 log.tmpl/development.log | 0
 log.tmpl/production.log  | 0
 log.tmpl/test.log        | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 log.tmpl/apache.log
 delete mode 100755 log.tmpl/development.log
 delete mode 100755 log.tmpl/production.log
 delete mode 100755 log.tmpl/test.log

diff --git a/log.tmpl/apache.log b/log.tmpl/apache.log
deleted file mode 100755
index e69de29b..00000000
diff --git a/log.tmpl/development.log b/log.tmpl/development.log
deleted file mode 100755
index e69de29b..00000000
diff --git a/log.tmpl/production.log b/log.tmpl/production.log
deleted file mode 100755
index e69de29b..00000000
diff --git a/log.tmpl/test.log b/log.tmpl/test.log
deleted file mode 100755
index e69de29b..00000000

From 7450e1b8d803c8b8f70c54c751c55c990469e88c Mon Sep 17 00:00:00 2001
From: Dan Rice <drice@diego>
Date: Wed, 26 Sep 2012 22:09:20 -0400
Subject: [PATCH 2/3] update .gitignore rules for rails3.1 asset pipeline

---
 .gitignore | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 708770e1..522bc7c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,15 +12,12 @@ db/data.yml
 db/schema.rb
 log
 nbproject
-public/javascripts/cache
-public/stylesheets/cache
 tmp
 vendor/plugins/query_trace/
 rerun.txt
-public/javascripts/jquery-cached.js
-public/javascripts/tracks-cached.js
-public/stylesheets/tracks-cached.css
 .idea
 .rvmrc
 .yardoc
 tags
+/.bundle/
+/public/assets/

From bc3af26320a6d0a0f8d4a0632ea6e5327becf194 Mon Sep 17 00:00:00 2001
From: Dan Rice <drice@diego>
Date: Wed, 26 Sep 2012 22:17:14 -0400
Subject: [PATCH 3/3] remove archived .gitignore.rails2

---
 .gitignore.rails2 | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 .gitignore.rails2

diff --git a/.gitignore.rails2 b/.gitignore.rails2
deleted file mode 100644
index 8e2cc0f5..00000000
--- a/.gitignore.rails2
+++ /dev/null
@@ -1,25 +0,0 @@
-*~
-*.tmproj
-.dotest
-/.emacs-project
-/.redcar
-config/database.yml
-config/site.yml
-config/deploy.rb
-db/*.sqlite3
-db/data.yml
-db/schema.rb
-log
-nbproject
-public/javascripts/cache
-public/stylesheets/cache
-tmp
-vendor/plugins/query_trace/
-rerun.txt
-public/javascripts/jquery-cached.js
-public/javascripts/tracks-cached.js
-public/stylesheets/tracks-cached.css
-.idea
-.rvmrc
-.yardoc
-tags