Commits

Show all
Author Commit Message Labels Comments Date
tenderlove
updating RAILS_VERSION
Jon Leighton
Merge commit 'v3.0.11' into 3-0-stable
tenderlove
Merge pull request #4514 from brainopia/update_timezone_offets Update time zone offset information
José Valim
Merge pull request #4372 from arunagw/fixed_failing_test Fixed failing test
Arun Agrawal
Fixed failing test for ruby-1.8.7-p357 See #4292
José Valim
Merge pull request #4246 from amatsuda/hashdos_30 bump up rack version to the one that includes the Hash DoS fix
Akira Matsuda
bump up rack version to the one that includes the Hash DoS fix
Santiago Pastorino
Merge pull request #4031 from arunagw/3-0-stable 3 0 stable travis sync
Jon Leighton
Don't notify campfire when the build keeps passing
Jon Leighton
Prefix newly added method to avoid breakings people's apps. See https://github.com/rails/rails/commit/378ce0e89c498e2844aef0b184c4fe8610d53b72 Fixes #3921.
José Valim
Update .travis.yml
Santiago Pastorino
Sync .travis.yml with master
Jon Leighton
Enable postgres on the CI heart beer sparkles Conflicts: Gemfile
tenderlove
Merge pull request #3846 from sumbach/backport-load-and-require-fixes-to-3-0 Backport load and require fixes to 3 0
tenderlove
`load` should also return the value from `super`
tenderlove
require needs to return true or false. thank you Ryan "zenspider" Davis
Sam Umbach
Simplify load and require tests - These tests don't use autoloading so there's no need to add anything to autoload_paths
Sam Umbach
Test that require and load raise LoadError if file not found
Sam Umbach
Test return value of ActiveSupport::Dependencies::Loadable#load
Sam Umbach
Test return value of ActiveSupport::Dependencies::Loadable#require - Add tests to protect from regressions in require's return value behavior - See a10606c490471d8e1483acb3b31d7f2d51e9ebbe (require needs to return true or false) for the original bug fix
José Valim
Merge pull request #3805 from arunagw/active_model_patch_3-0-stable Active model patch 3 0 stable
Arun Agrawal
ActiveModel confirmation validator fix fixes #1152 If you have an ActiveModel class that has a method email_address_confirmation. This method is being overwritten by the method defined in the Confirmation validator.
Jon Leighton
Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685. Conflicts: actionpack/CHANGELOG.md Conflicts: actionpack/CHANGELOG.md
Jon Leighton
Preparing for 3.0.11 release
tenderlove
fixing test case test on 1.9.3dev
tenderlove
removing stubs. 1.9.3 implements Date.today in C so mocking the return value of Time.now does nothing
Just Lest
_html translation should escape interpolated arguments Conflicts: actionpack/CHANGELOG.md
Jon Leighton
Implement a workaround for a bug in ruby-1.9.3p0. The bug is that an error would be raised while attempting to convert a template from one encoding to another. Please see http://redmine.ruby-lang.org/issues/5564 for more details. The workaround is to load all conversions into memory ahead of time, and will only happen if the ruby version is *exactly* 1.9.3p0. The hope is obviously that the underlying problem will be resolved in the next patchle…
Jon Leighton
Use broken YAML that will fail with Syck as well as Psych. Fixes test_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7. Cherry-pick from 3-1-stable: b8d46924e70e0847e92e1d2dbaaec8c11381072c Conflicts: activerecord/test/cases/fixtures_test.rb
José Valim
Merge pull request #3655 from arunagw/mysql_bump_3-0-stable Mysql bump 3 0 stable
  1. Prev
  2. Next