Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Line break in migration template and nicer code indentation | Łukasz Strzałkowski | 2010-06-25 | 1 | -6/+8 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge remote branch 'miloops/fixes' | José Valim | 2010-06-24 | 8 | -48/+18 |
|\ | |||||
| * | Only yield block if given. | Emilio Tagua | 2010-06-24 | 1 | -2/+2 |
| | | |||||
| * | Remove block definitions in finder methods. | Emilio Tagua | 2010-06-24 | 1 | -4/+4 |
| | | |||||
| * | Remove block definition from method, is not needed since yield is used inside. | Emilio Tagua | 2010-06-24 | 3 | -3/+3 |
| | | |||||
| * | Don't define block, just yield if block is given. | Emilio Tagua | 2010-06-24 | 1 | -7/+7 |
| | | |||||
| * | Remove deprecated block usage in composed_of. | Emilio Tagua | 2010-06-24 | 2 | -32/+2 |
| | | |||||
* | | Your original TIME ZONE value on PostgreSQL is correctly restored now, after ↵ | Santiago Pastorino | 2010-06-24 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | going through options :utc and then going back to :local [#4950 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | quotes are not necessary here | Santiago Pastorino | 2010-06-24 | 1 | -2/+2 |
|/ | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Move Rails::LogSubscriber to ActiveSupport::LogSubscriber, allowing ↵ | José Valim | 2010-06-24 | 5 | -40/+37 |
| | | | | frameworks like ActiveRecord and ActiveResource to log outsude Rails::Application [#4816 state:resolved] | ||||
* | Add tests for relation count. Fix other tests that were conceptually wrong. | Emilio Tagua | 2010-06-24 | 2 | -2/+6 |
| | | | | | | [#4882 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Remove incorrect comment regarding #initialize_copy | Paul Gillard | 2010-06-23 | 1 | -8/+0 |
| | | | | | | Comment added in #3164 is incorrect after reading http://dev.rubyonrails.org/ticket/7191. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Sessions should not be created until written to and session data should be ↵ | Michael Lovitt | 2010-06-23 | 1 | -0/+8 |
| | | | | | | | | destroyed on reset. [#4938] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | adding fix for to_xml for ActiveRecord relation object | Neeraj Singh | 2010-06-23 | 2 | -1/+6 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | ActiveRecord's relation object should respond to to_json and to_yaml | Neeraj Singh | 2010-06-23 | 2 | -1/+11 |
| | | | | | | [#4547 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | adding column named 'group' to ensure that nothing breaks given that 'group' ↵ | Neeraj Singh | 2010-06-23 | 3 | -6/+7 |
| | | | | | | | | is sql reserved word [#4945 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Patch for Namespace problem in Scaffold. [#4763 state:resolved] | Mohammed Siddick.E | 2010-06-23 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Don't clone associations [#4894 state:resolved] | Paul Gillard | 2010-06-23 | 2 | -0/+9 |
| | | | | | | Cloning an active record object should be shallow in that it should copy attributes but not associations. This was no longer true as a result of #3164. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | remove_column should raise an ArgumentError when no columns are passed ↵ | Jeff Dean | 2010-06-23 | 3 | -0/+6 |
| | | | | | | [#4803 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Fix connection reloading in development mode. [#4929 state:resolved] | Edgars Beigarts | 2010-06-22 | 2 | -3/+6 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Avoid method redefined warning | Santiago Pastorino | 2010-06-22 | 1 | -1/+4 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fix small bug where ActiveRecord::PredicateBuilder#build_from_hash didn't ↵ | James Harton | 2010-06-22 | 1 | -1/+1 |
| | | | | | | test for Arel::Relation as right hand value. [#4917 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | test for #4917 | Neeraj Singh | 2010-06-22 | 1 | -0/+7 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Clean CHANGELOG whitespace. | Emilio Tagua | 2010-06-22 | 1 | -254/+254 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fix order method to accept relation attributes. | Emilio Tagua | 2010-06-22 | 2 | -3/+7 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Use the new query API in AR performance script. | Emilio Tagua | 2010-06-22 | 1 | -3/+3 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an options ↵ | Jeroen van Dijk | 2010-06-21 | 4 | -30/+36 |
| | | | | | | | | | | | | | | | | hash and make various Validators pass their (filtered) options. This makes it possible to pass additional options through Validators to message generation. E.g. plugin authors want to add validates_presence_of :foo, :format => "some format". Also, cleanup the :default vs :message options confusion in ActiveModel validation message generation. Also, deprecate ActiveModel::Errors#add_on_blank(attributes, custom_message) in favor of ActiveModel::Errors#add_on_blank(attributes, options). Also, refactoring of ActiveModel and ActiveRecord Validation tests. Test are a lot more DRY now. Better test coverage as well now. The first four points were reapplied from an older patch of Sven Fuchs which didn't apply cleanly anymore and was not complete yet. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Don't waste time building relations if there are no values presents. [#4860 ↵ | Emilio Tagua | 2010-06-21 | 1 | -4/+4 |
| | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-20 | 25 | -137/+131 |
|\ | | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb | ||||
| * | Fix problem with migrations template that can cause bogus code to be created | Steve Abatangle | 2010-06-20 | 1 | -4/+8 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | remove executable permission from files that don't need it. [#4802 ↵ | rohit | 2010-06-20 | 6 | -0/+0 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Refactor build_arel: move joins out and simplify havings. [#4860 state:resolved] | Emilio Tagua | 2010-06-20 | 1 | -46/+46 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Don't overwrite unsaved updates when loading an association but preserve the ↵ | James Le Cuirot | 2010-06-20 | 3 | -3/+28 |
| | | | | | | | | | | | | | | | | order of the loaded records. Reapplied from before but now allows already-saved records to be refreshed. [#4830 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Merge branch 'master' of github.com:rails/rails | José Valim | 2010-06-20 | 5 | -14/+21 |
| |\ | |||||
| | * | Fix test which prevents connection reset on failing and remove hardcoded ↵ | Master Lambaster | 2010-06-18 | 1 | -8/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | connection [#4689 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Fix bug with rolling back frozen attributes. | Brian Durand | 2010-06-18 | 4 | -6/+14 |
| | | | | | | | | | | | | | | | | | | [#2991] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | ActiveModel::Validations::Callbacks should not be required by default. | José Valim | 2010-06-19 | 2 | -9/+2 |
| | | | |||||
| * | | moving before_validation and after_validation functionality from ↵ | Neeraj Singh | 2010-06-19 | 3 | -22/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord to ActiveModel [#4653 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | Clear DescendantsTracker on each request. | José Valim | 2010-06-19 | 1 | -1/+0 |
| | | | |||||
| * | | ActiveRecord and ActionPack now use the new descendants implementation. | José Valim | 2010-06-19 | 4 | -38/+7 |
| |/ | |||||
| * | setting the timezone in postgres to whatever ruby thinks the timezone is ↵ | Aaron Patterson | 2010-06-17 | 2 | -1/+11 |
| | | | | | | | | | | | | [#4895 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | documents how to run an individual test in AR | Xavier Noria | 2010-06-17 | 1 | -0/+2 |
| | | |||||
| * | pdoc tasks publishe APIs in api.rubyonrails.org | Xavier Noria | 2010-06-16 | 1 | -1/+1 |
| | | |||||
| * | use RDoc 2.2 to generate the documentation of individual components | Xavier Noria | 2010-06-16 | 1 | -1/+2 |
| | | |||||
| * | use assert_in_delta() for floating point comparisons in tests [#4871 ↵ | Aaron Patterson | 2010-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
* | | All scopes are now cross-referenced. | Rizwan Reza | 2010-06-21 | 1 | -4/+4 |
| | | |||||
* | | Missing quote and indentation wrong | Malcolm Locke | 2010-06-17 | 1 | -2/+2 |
| | | |||||
* | | Adds backslash to scope for cross-references. | Rizwan Reza | 2010-06-16 | 1 | -1/+1 |
| | | |||||
* | | Adds title to activerecord/lib/active_record/associations/* | Rizwan Reza | 2010-06-16 | 10 | -0/+12 |
| | | |||||
* | | Adds title to the rest of the files in activerecord/lib | Rizwan Reza | 2010-06-16 | 2 | -2/+7 |
| | |