Merge branch 'master' of github.com:thinchat/thin_auth

thinchat · Jun 17, 2012 · cc26521 · cc26521
2 parents 8aace09 + 421bbc7
commit cc26521
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 72 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,5 @@ capybara-*.html
 /spec/tmp/*
 **.orig
 rerun.txt
-pickle-email-*.html
+pickle-email-*.html
+config/database.yml
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "config/secret"]
 	path = config/secret
 	url = [email protected]:chrismanderson/thin_secret.git
+[submodule "config/deploy"]
+	path = config/deploy
+	url = [email protected]:thinchat/thin_cap.git
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,6 +1,4 @@
 class ApplicationController < ActionController::Base
-  protect_from_forgery
-
   private
 
   def after_sign_out_path_for(resource_or_scope)

diff --git a/config/deploy b/config/deploy
diff --git a/config/deploy.rb b/config/deploy.rb
diff --git a/config/deploy.rb b/config/deploy.rb
@@ -0,0 +1 @@
+deploy/thin_auth_deploy.rb
diff --git a/config/deploy/development.rb b/config/deploy/development.rb
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb
diff --git a/config/secret b/config/secret