| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-28 | 23 | -188/+270 |
| |\ | |||||
| | * | Fixes #2415 by creating a new instance of the Model when saving attributes ↵ | George Montana Harkin | 2010-06-27 | 1 | -8/+11 |
| | | | | | | | | | | | | | to that model and the associated attributes already exist. Tests included. [#2415 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | removing useless code. [#4988 state:resolved] | Aaron Patterson | 2010-06-26 | 1 | -15/+4 |
| | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Refactor: metaprogramming here it's confusing and make use of tap | Santiago Pastorino | 2010-06-26 | 1 | -64/+73 |
| | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Refactor of column_exists? method and this works with PostgreSQL | Santiago Pastorino | 2010-06-26 | 1 | -12/+6 |
| | | | |||||
| | * | Removes useless flatten | Santiago Pastorino | 2010-06-26 | 1 | -4/+9 |
| | | | |||||
| | * | Add module_eval missing file_name and line_number args [#4712 state:resolved] | Evgeniy Dolzhenko | 2010-06-26 | 1 | -2/+2 |
| | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | adding adapter tests, avoiding private apis, fixing code in 1.9 [#4986 ↵ | Aaron Patterson | 2010-06-26 | 1 | -3/+7 |
| | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Create a little bit less objects in ARel. | José Valim | 2010-06-26 | 1 | -6/+9 |
| | | | |||||
| | * | refactoring the postgres adapter index method to avoid inject and use ↵ | Aaron Patterson | 2010-06-26 | 1 | -4/+4 |
| | | | | | | | | | | | | | values_at. [#4976 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | blocks removed from all the ActiveRelation query_methods, extend method ↵ | Santiago Pastorino | 2010-06-26 | 2 | -8/+13 |
| | | | | | | | | | | | | | added instead Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Merge branch 'tago' | José Valim | 2010-06-26 | 2 | -4/+63 |
| | |\ | |||||
| | | * | Add column and index query methods to ActiveRecord::Schema | Andrew White | 2010-06-26 | 2 | -4/+63 |
| | | | | | | | | | | | | | | | | | | | [#4219 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | | index dump should not include full text indexes. Thanks Ken Mayer for the ↵ | Aaron Patterson | 2010-06-26 | 1 | -8/+3 |
| | | | | | | | | | | | | | | | | | | | original patch! [#4949 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | | reorder method added to ActiveRelation | Santiago Pastorino | 2010-06-26 | 1 | -0/+8 |
| | |/ | | | | | | | | | | | [#4972 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Support for multiple selects added | Neeraj Singh and Santiago Pastorino | 2010-06-25 | 1 | -4/+7 |
| | | | | | | | | | [#4841 state:committed] | ||||
| | * | Makes a build_select for the select part of build_arel | Santiago Pastorino | 2010-06-25 | 1 | -10/+13 |
| | | | |||||
| | * | Metaprogramming not needed here | Santiago Pastorino | 2010-06-25 | 1 | -11/+9 |
| | | | |||||
| | * | Merge remote branch 'miloops/fixes' | José Valim | 2010-06-24 | 7 | -20/+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 | 1 | -4/+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 | 4 | -35/+33 |
| | | | | | | | | | frameworks like ActiveRecord and ActiveResource to log outsude Rails::Application [#4816 state:resolved] | ||||
| | * | 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 | 1 | -1/+1 |
| | | | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | [#4547 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Don't clone associations [#4894 state:resolved] | Paul Gillard | 2010-06-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | 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 | 2 | -0/+2 |
| | | | | | | | | | | | | | [#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> | ||||
| | * | 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> | ||||
| | * | Fix order method to accept relation attributes. | Emilio Tagua | 2010-06-22 | 1 | -1/+1 |
| | | | | | | | | | 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 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | | Revert "Guides: Add :references to supported column types." | rohit | 2010-06-24 | 1 | -1/+1 |
| | | | | | | | | | This reverts commit 41ed4db560bf50e0ccb99915a03c37d39bff135b. | ||||
| * | | Guides: Add :references to supported column types. | rohit | 2010-06-24 | 1 | -1/+1 |
| | | | |||||
| * | | Improve documentation for assocations :autosave option. | Edgars Beigarts | 2010-06-22 | 1 | -4/+12 |
| |/ | |||||
| * | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-20 | 12 | -112/+71 |
| |\ | | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb | ||||
| | * | remove executable permission from files that don't need it. [#4802 ↵ | rohit | 2010-06-20 | 3 | -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 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | 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 | 2 | -2/+3 |
| | |\ | |||||
| | | * | Fix bug with rolling back frozen attributes. | Brian Durand | 2010-06-18 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | [#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 |
| | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |