aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-01-30 11:30:27 -0800
committerYehuda Katz <wycats@gmail.com>2009-01-30 11:30:27 -0800
commit3030bc90c95e335d726f06fd7a61ed96055e9109 (patch)
tree5b079250b368f0e8af6d2f72a4278fdab3382b26 /ci
parentae42163bf5497849e4fcbb736505910c17640459 (diff)
parent85750f22c90c914a429116fb908990c5a2c68379 (diff)
downloadrails-3030bc90c95e335d726f06fd7a61ed96055e9109.tar.gz
rails-3030bc90c95e335d726f06fd7a61ed96055e9109.tar.bz2
rails-3030bc90c95e335d726f06fd7a61ed96055e9109.zip
Merge commit 'rails/3-0-unstable'
Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb
Diffstat (limited to 'ci')
-rw-r--r--ci/cruise_config.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/cruise_config.rb b/ci/cruise_config.rb
index 325c21397e..7985e3c8df 100644
--- a/ci/cruise_config.rb
+++ b/ci/cruise_config.rb
@@ -1,6 +1,6 @@
Project.configure do |project|
project.build_command = 'ruby ci/ci_build.rb'
-# project.email_notifier.emails = ['thewoolleyman@gmail.com']
- project.email_notifier.emails = ['thewoolleyman@gmail.com','michael@koziarski.com', 'david@loudthinking.com', 'jeremy@bitsweat.net', 'josh@joshpeek.com', 'pratiknaik@gmail.com', 'wycats@gmail.com']
+ project.email_notifier.emails = ['thewoolleyman@gmail.com']
+# project.email_notifier.emails = ['thewoolleyman@gmail.com','michael@koziarski.com', 'david@loudthinking.com', 'jeremy@bitsweat.net', 'josh@joshpeek.com', 'pratiknaik@gmail.com', 'wycats@gmail.com']
project.email_notifier.from = 'thewoolleyman+railsci@gmail.com'
end