Commits

Show all
Author Commit Message Labels Comments Date
Yehuda Katz
Merge branch 'master' of github.com:rails/rails
Tags
v3.0.0.beta4
Yehuda Katz
Update bundler dependency
José Valim
Add more cases to previous commit [#4394 state:resolved]
Jan De Poorter
Make sure namespaces are nested within resources Signed-off-by: José Valim <jose.valim@gmail.com>
Neeraj Singh
cache_sweeper yields blank output [#3914 state:open] Signed-off-by: José Valim <jose.valim@gmail.com>
Brian Durand
Make logic for after_commit and after_rollback :on option work like it does for validation callbacks. [#2991 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Jeremy Kemper
Revert "Temporarily revert "Update after_commit and after_rollback docs and tests to use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction."" This reverts commit 1b2941cba1165b0721f57524645fe378bee2a950. [#2991]
Jeremy Kemper
Clarify Fixture#key_ and value_list
Xavier Noria
Merge remote branch 'docrails/master'
José Valim
Bring pg back.
miloops
Avoid PostgreSQL and MySQL tests warnings. Signed-off-by: José Valim <jose.valim@gmail.com>
David Heinemeier Hansson
Revert "Add shallow routes to the new router" for now. Needs more work. This reverts commit 67a60ee314f53abcde78f8ecd2a1f7c9ef8264e1.
Andrew Bloomgarden
Fix ActiveRecord::Base.compute_type swallowing NoMethodError. [#4751 state:resolved] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
David Chelimsky
Memoize the object returned by _view in ActionView::TestCase::Behavior [#4799 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
Xavier Noria
Merge remote branch 'rails/master'
miloops
Add parentheses to avoid warnings when running AR tests. Signed-off-by: José Valim <jose.valim@gmail.com>
miloops
Bump Arel to 0.4.0 Signed-off-by: José Valim <jose.valim@gmail.com>
Jeremy Kemper
Temporarily revert "Update after_commit and after_rollback docs and tests to use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction." This reverts commits d2a49e4b1f30c5997e169110eed94a55aee53f56 and da840d13da865331297d5287391231b1ed39721b. [#2991] Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/transactions.rb activerecord/test/cases/transaction_callbacks_test.rb
David Heinemeier Hansson
Get ready for beta 4
David Heinemeier Hansson
Fixed double output from cache in no caching mode
tenderlove
forcing encoding on 1.9 when dealing with "binary" columns [#4612 state:resolved] Signed-off-by: wycats <wycats@gmail.com>
Yehuda Katz
Missing require restored
José Valim
Accept both regexps and strings for LOCALHOST.
Xavier Noria
AS guide: documents datetime calculations
Yehuda Katz
Require encoding.rb
Prem Sichanugrist
Make sure that rails recognized the full notation of IPv6 loopback address, and recognize 127.0.0.0/8 in IPv4 Signed-off-by: José Valim <jose.valim@gmail.com>
Andrew White
Fix resources ignoring scope options Signed-off-by: José Valim <jose.valim@gmail.com>
Rohit Arondekar
Made markdown honor :safe option and handle safe input. Also added tests for markdown. [#4794 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
José Valim
Fix generator test broken when rails new was added.
José Valim
Hide remaining generators hooks [#4790 state:resolved]
  1. Prev
  2. Next