diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-02-06 02:25:55 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-02-06 02:25:55 +0000 |
| commit | b9ba2fe55059a6d9f141d1d502e16bdfd46f26cb (patch) | |
| tree | 491c3ce7d406a723e5c06e3bccf4559a0de86199 /ci | |
| parent | 97612394672203eefd04e3b1947273a3ab4ec930 (diff) | |
| parent | 96d610553e5fdaabc923835ab1f194070ddb4477 (diff) | |
| download | rails-b9ba2fe55059a6d9f141d1d502e16bdfd46f26cb.tar.gz rails-b9ba2fe55059a6d9f141d1d502e16bdfd46f26cb.tar.bz2 rails-b9ba2fe55059a6d9f141d1d502e16bdfd46f26cb.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/guides/files/javascripts/code_highlighter.js
railties/guides/files/javascripts/guides.js
railties/guides/files/javascripts/highlighters.js
railties/guides/files/stylesheets/main.css
railties/guides/files/stylesheets/print.css
railties/guides/files/stylesheets/reset.css
railties/guides/files/stylesheets/style.css
railties/guides/files/stylesheets/syntax.css
railties/guides/rails_guides/indexer.rb
railties/guides/source/2_2_release_notes.textile
railties/guides/source/2_3_release_notes.textile
railties/guides/source/action_controller_overview.textile
railties/guides/source/action_mailer_basics.textile
railties/guides/source/active_record_basics.textile
railties/guides/source/activerecord_validations_callbacks.textile
railties/guides/source/association_basics.textile
railties/guides/source/caching_with_rails.textile
railties/guides/source/command_line.textile
railties/guides/source/debugging_rails_applications.textile
railties/guides/source/form_helpers.textile
railties/guides/source/getting_started.textile
railties/guides/source/i18n.textile
railties/guides/source/layout.html.erb
railties/guides/source/layouts_and_rendering.textile
railties/guides/source/migrations.textile
railties/guides/source/performance_testing.textile
railties/guides/source/plugins.textile
railties/guides/source/rails_on_rack.textile
railties/guides/source/routing.textile
railties/guides/source/security.textile
railties/guides/source/testing.textile
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/ci_build.rb | 4 | ||||
| -rw-r--r-- | ci/geminstaller.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/ci_build.rb b/ci/ci_build.rb index 010f78ba09..0b9bd3d278 100755 --- a/ci/ci_build.rb +++ b/ci/ci_build.rb @@ -98,9 +98,9 @@ puts "[CruiseControl] #{`mysql --version`}" puts "[CruiseControl] #{`pg_config --version`}" puts "[CruiseControl] SQLite2: #{`sqlite -version`}" puts "[CruiseControl] SQLite3: #{`sqlite3 -version`}" -`gem env`.each {|line| print "[CruiseControl] #{line}"} +`gem env`.each_line {|line| print "[CruiseControl] #{line}"} puts "[CruiseControl] Local gems:" -`gem list`.each {|line| print "[CruiseControl] #{line}"} +`gem list`.each_line {|line| print "[CruiseControl] #{line}"} failures = build_results.select { |key, value| value == false } diff --git a/ci/geminstaller.yml b/ci/geminstaller.yml index d11bf04485..33f1e81179 100644 --- a/ci/geminstaller.yml +++ b/ci/geminstaller.yml @@ -7,7 +7,7 @@ gems: - name: memcache-client version: >= 1.5.0 - name: mocha - version: >= 0.9.4 + version: >= 0.9.5 - name: mysql #version: >= 2.7 version: = 2.7 |