diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-08-28 11:36:56 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-08-28 11:36:56 +0100 |
| commit | 3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce (patch) | |
| tree | cd86abce0ab9accbbbf24018961464590fa6bb39 /ci/cruise_config.rb | |
| parent | 5db2f199aba9aa8d00adefa8237922ad684aca03 (diff) | |
| parent | 96c6fe084228d570dad80e3100830edb2bc0448d (diff) | |
| download | rails-3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce.tar.gz rails-3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce.tar.bz2 rails-3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce.zip | |
Merge commit 'mainstream/master'
Conflicts:
activerecord/lib/active_record/associations/association_proxy.rb
activerecord/lib/active_record/callbacks.rb
activeresource/lib/active_resource/base.rb
Diffstat (limited to 'ci/cruise_config.rb')
| -rw-r--r-- | ci/cruise_config.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ci/cruise_config.rb b/ci/cruise_config.rb new file mode 100644 index 0000000000..ec1c82a8bf --- /dev/null +++ b/ci/cruise_config.rb @@ -0,0 +1,5 @@ +Project.configure do |project| + project.build_command = 'ruby ci/ci_build.rb' + project.email_notifier.emails = ['thewoolleyman@gmail.com','michael@koziarski.com'] + project.email_notifier.from = 'thewoolleyman+railsci@gmail.com' +end |