Merge remote branch 'upstream/master' into hogeng

Conflicts: vendor/plugins/livesearch_sidebar/app/views/livesearch_sidebar/_content.html.erb
yaegashi · Feb 11, 2013 · 36cf8d5 · 36cf8d5
2 parents 10b7724 + cf8efcb
commit 36cf8d5
Show file tree

Hide file tree

Showing 550 changed files with 13,929 additions and 19,941 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@ config/unicorn.rb
 *.log
 *~
 db/*.sqlite*
-db/schema.rb
 .*.swp
 .*.swo
 .DS_Store

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+before_install:
+  - cp config/database.yml.pgsql config/database.yml
+before_script:
+  - rake db:create db:migrate