diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-08-14 02:13:00 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-08-14 04:12:33 -0300 |
| commit | b451de0d6de4df6bc66b274cec73b919f823d5ae (patch) | |
| tree | f252c4143a0adb3be7d36d543282539cca0fb971 /ci | |
| parent | 1590377886820e00b1a786616518a32f3b61ec0f (diff) | |
| download | rails-b451de0d6de4df6bc66b274cec73b919f823d5ae.tar.gz rails-b451de0d6de4df6bc66b274cec73b919f823d5ae.tar.bz2 rails-b451de0d6de4df6bc66b274cec73b919f823d5ae.zip | |
Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/ci_setup_notes.txt | 6 | ||||
| -rw-r--r-- | ci/site_config.rb | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ci/ci_setup_notes.txt b/ci/ci_setup_notes.txt index b61e893b8e..9451fb0dc6 100644 --- a/ci/ci_setup_notes.txt +++ b/ci/ci_setup_notes.txt @@ -26,7 +26,7 @@ $ sudo shutdown -r now * Update aptitude: $ sudo aptitude update -* Use cinabox to perform rest of ruby/ccrb setup: +* Use cinabox to perform rest of ruby/ccrb setup: * http://github.com/thewoolleyman/cinabox/tree/master/README.txt # This is not yet properly supported by RubyGems... @@ -41,7 +41,7 @@ $ sudo aptitude update # # add these lines: # --- # gemhome: /home/ci/.gem/ruby/1.8 -# gempath: +# gempath: # - /home/ci/.gem/ruby/1.8 * If you did not configure no-root-gem installation via ~/.gemrc as shown above, then allow no-password sudo for gem installation: @@ -89,7 +89,7 @@ Configuration.dashboard_url = 'http://ci.yourdomain.com/' Configuration.serialize_builds = true Configuration.serialized_build_timeout = 1.hours BuildReaper.number_of_builds_to_keep = 100 - + * Copy and configure cruise project config file $ cp ~/.cruise/projects/rails/work/ci/cruise_config.rb ~/.cruise/projects/rails $ vi ~/.cruise/projects/rails/cruise_config.rb: diff --git a/ci/site_config.rb b/ci/site_config.rb index c08dac8e84..09d5b550e8 100644 --- a/ci/site_config.rb +++ b/ci/site_config.rb @@ -6,10 +6,10 @@ # EMAIL NOTIFICATION # ------------------ -# CruiseControl.rb can notify you about build status via email. It uses the Action Mailer component of Ruby on Rails -# framework. Obviously, Action Mailer needs to know how to send out email messages. +# CruiseControl.rb can notify you about build status via email. It uses the Action Mailer component of Ruby on Rails +# framework. Obviously, Action Mailer needs to know how to send out email messages. # If you have an SMTP server on your network, and it needs no authentication, write this in your site_config.rb: -# +# ActionMailer::Base.smtp_settings = { :address => "localhost", :domain => "ci.rubyonrails.org", @@ -26,8 +26,8 @@ ActionMailer::Base.smtp_settings = { # :user_name => "yourgmailaccount", # :password => "yourgmailpassword" # } -# -# The same approach works for other SMTP servers thet require authentication. Note that GMail's SMTP server runs on a +# +# The same approach works for other SMTP servers thet require authentication. Note that GMail's SMTP server runs on a # non-standard port 587 (standard port for SMTP is 25). # # For further details about configuration of outgoing email, see Ruby On Rails documentation for ActionMailer::Base. @@ -63,7 +63,7 @@ Configuration.serialize_builds = true # Amount of time a project will wait to build before failing when build serialization is on Configuration.serialized_build_timeout = 3.hours -# To delete build when there are more than a certain number present, uncomment this line - it will make the dashboard +# To delete build when there are more than a certain number present, uncomment this line - it will make the dashboard # perform better BuildReaper.number_of_builds_to_keep = 100 |