Commits

Show all
Author Commit Message Labels Comments Date
Jon Leighton
Preparing for 3.0.11 release
Tags
v3.0.11
tenderlove
fixing test case test on 1.9.3dev
Branches
3-0-stable
tenderlove
removing stubs. 1.9.3 implements Date.today in C so mocking the return value of Time.now does nothing
Branches
3-0-stable
Just Lest
_html translation should escape interpolated arguments Conflicts: actionpack/CHANGELOG.md
Branches
3-0-stable
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…
Branches
3-0-stable
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
Branches
3-0-stable
José Valim
Merge pull request #3655 from arunagw/mysql_bump_3-0-stable Mysql bump 3 0 stable
Branches
3-0-stable
Arun Agrawal
Mysql2 version bump! I saw one bug fixed here https://github.com/brianmario/mysql2/commit/e60599b912dfc6c0c0394656b103f537414d93f4
Branches
3-0-stable
tenderlove
Revert "Merge pull request #2122 from dyba/3-0-stable" This reverts commit b81c3f7d6a41488ba40f41b2b0ed9c32d83e0b39, reversing changes made to 6122924121f286e79a947cdf4abfe7ca8e78bbd6.
Branches
3-0-stable
tenderlove
Merge pull request #2122 from dyba/3-0-stable Issue #1866: Changed Commands module to RailsCommands.
Branches
3-0-stable
Yehuda Katz
Merge pull request #3646 from mhuffnagle/3-0-stable Fix for relative_url_root= missing parameter (issue 3645)
Branches
3-0-stable
mhuffnagle
Added a missing parameter to relative_url_root= that was causing an ArgumentError: wrong number of arguments (1 for 0) to be thrown at actionpack-3.0.10/lib/action_controller/railtie.rb:54.
Branches
3-0-stable
Josh Kalderimis
Remove a circular require in AS deprecations. This is safe as AS deprecations is autoloaded as needed.
Branches
3-0-stable
Vijay Dev
Merge pull request #3330 from arunagw/ignore_sqlnet_3-0-stable Ignore sqlnet 3 0 stable
Branches
3-0-stable
Arun Agrawal
activerecord/sqlnet.log into gitignore when running with oracle.
Branches
3-0-stable
Vijay Dev
Merge pull request #3233 from benolee/fix_spelling_in_doc_app_rake_task Fix spelling in doc:app rake task
Branches
3-0-stable
Akira Matsuda
ruby193: String#prepend is also unsafe
Branches
3-0-stable
Akira Matsuda
override unsafe methods only if defined on String
Branches
3-0-stable
Ben Holley
Fix spelling in doc:app rake task
Branches
3-0-stable
Jeremy Kemper
Merge pull request #2801 from jeremyevans/patch-1 Fix obviously breakage of Time.=== for Time subclasses
Branches
3-0-stable
José Valim
Merge pull request #3142 from parndt/3-0-stable Fixes #3087
Branches
3-0-stable
Philip Arndt
Fixes #3087 by removing autoload for non-existant DeprecatedBlockHelpers
Branches
3-0-stable
Pratik Naik
Dont use association proxy#reload to load the target for the first time
Branches
3-0-stable
misfo
prevent errors when passing a frozen string as a param to ActionController::TestCase#process since ActionDispatch::Http::Parameters#encode_params will force encoding on all params strings (when using an encoding aware Ruby), dup all strings passed into process. This prevents modification of params passed in and, more importantly, doesn't barf when a frozen string is passed thanks and high fives to kinsteronline
Branches
3-0-stable
Vijay Dev
fix assert message
Branches
3-0-stable
tenderlove
Exceptions from database adapters should not lose their backtrace.
Branches
3-0-stable
Vijay Dev
Merge pull request #2682 from guilleiguaran/3-0-stable-changelogs Update changelogs (3-0-stable)
Branches
3-0-stable
Guillermo Iguaran
Updating changelogs in 3-0-stable
Branches
3-0-stable
José Valim
Merge pull request #2939 from akaspick/url_for_fix_3_0 fix url_for when passing a hash to prevent unwanted additional values being added to the hash (backport to 3-0-stable)
Branches
3-0-stable
Andrew Kaspick
fix url_for to not add additional unwanted options when called with a hash
Branches
3-0-stable
  1. Prev
  2. Next