aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge branch 'master' into joindepAaron Patterson2013-10-156-5/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: use the cached arel table Fix typo in the changelog entry Don't remove the select values to add they back again Pluck on NullRelation accepts a list of columns Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
| * | | | | | | | | | | | | use the cached arel tableAaron Patterson2013-10-152-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix typo in the changelog entryRafael Mendonça França2013-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | Don't remove the select values to add they back againRafael Mendonça França2013-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
| * | | | | | | | | | | | | Merge pull request #12547 from derekprior/dp-fix-null-relation-pluckRafael Mendonça França2013-10-153-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pluck on NullRelation should accept a list of columns
| | * | | | | | | | | | | | | Pluck on NullRelation accepts a list of columnsDerek Prior2013-10-153-2/+9
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `pluck` was updated to accept a list of columns, but the `NullRelation` was never updated to match that signature. As a result, calling `pluck` on a `NullRelation` results in an `ArgumentError`.
* | | | | | | | | | | | | | Merge branch 'master' into joindepAaron Patterson2013-10-1556-203/+365
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (44 commits) grammar fix (reverted in e9a1ecd) Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no longer depends on/" Add missed require making `enable_warnings` available Prepare generated Gemfile for Capistrano 3 Added --model-name option scaffold_controller_generator. read the association instead of sending we should have unique sponsorable ids in the fixtures at least simplify populating the ordering hash the preloader for the RHS has all the preloaded records, so ask it only calculate offset index once. #12537 Remove size alias for length validation Fix `singleton_class?` Minor Refactoring to `NumberHelper#number_to_human` `$SAFE = 4;` has been removed with Ruby 2.1 scope_chain should not be mutated for other reflections Remove `default_primary_key_type` and extract contains of `native_database_types` to a constant since they aren't conditional now in SQLite3Adapter. Makes it more like other adapters. cleanup changelog entry format. [ci skip] Extract a function to determine if the default value is a function Push default_function to superclass to avoid method check Dump the default function when the primary key is uuid ... Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
| * | | | | | | | | | | | | grammar fix (reverted in e9a1ecd)Vijay Dev2013-10-151-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-10-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no ↵Vijay Dev2013-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | longer depends on/" This reverts commit 49f513c25415f94452af1bb8fe3f55f090a6d0f2. Reason: Changelogs aren't supposed to be edited in docrails.
| | * | | | | | | | | | | | Use ActiveRecord::Base#update! instead of #update_attributes!Zachary Scott2013-09-281-1/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no longer ↵Zachary Scott2013-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | depends on/
| * | | | | | | | | | | | | Merge pull request #12524 from kirs/patch-1Rafael Mendonça França2013-10-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare generated Gemfile for Capistrano 3
| | * | | | | | | | | | | | | Prepare generated Gemfile for Capistrano 3Kir Shatrov2013-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capistrano 3 is now rails-less, so we need to encourage developers to use capistrano-rails gem. More details: http://www.capistranorb.com/documentation/frameworks/ruby-on-rails/ [ci skip]
| * | | | | | | | | | | | | | Merge pull request #12543 from route/missed_requireRafael Mendonça França2013-10-151-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missed require making `enable_warnings` available
| | * | | | | | | | | | | | | | Add missed require making `enable_warnings` availableDmitry Vorotilin2013-10-151-0/+1
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge pull request #11432 from yalab/generate_model_name_optionYves Senn2013-10-155-6/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add --model-name option into scaffold_controller generator
| | * | | | | | | | | | | | | | Added --model-name option scaffold_controller_generator.yalab2013-10-155-6/+53
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge pull request #12534 from vipulnsward/minor_number_helper_perfsRafael Mendonça França2013-10-141-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor Refactoring to `NumberHelper#number_to_human`
| | * | | | | | | | | | | | | | Minor Refactoring to `NumberHelper#number_to_human`Vipul A M2013-10-141-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use destructive `map` and `sort_by` to save extra object creation. * Create `INVERTED_DECIMAL_UNITS.invert` constant instead of repeatedly doing `DECIMAL_UNITS.invert`
| * | | | | | | | | | | | | | | read the association instead of sendingAaron Patterson2013-10-141-1/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | we should have unique sponsorable ids in the fixtures at leastAaron Patterson2013-10-141-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #12536 from sbagdat/patch-1Rafael Mendonça França2013-10-141-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove size alias for length validation
| | * | | | | | | | | | | | | | | Remove size alias for length validationSıtkı Bağdat2013-10-141-2/+0
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed ```The `size` helper is an alias for `length`.``` line. If you use this "nonexist" helper, you will get an error message like this: ``` ArgumentError: Unknown validator: 'SizeValidator' ... ``` Maybe wanted to mean ```validates_size_of``` helper as an alias for ```validates_length_of``` helper.
| * | | | | | | | | | | | | | | simplify populating the ordering hashAaron Patterson2013-10-141-10/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | the preloader for the RHS has all the preloaded records, so ask itAaron Patterson2013-10-141-3/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | only calculate offset index once. #12537Aaron Patterson2013-10-141-6/+10
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #10538 from neerajdotname/3882Rafael Mendonça França2013-10-149-1/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scope_chain should not be mutated for other reflections
| | * | | | | | | | | | | | | | scope_chain should not be mutated for other reflectionsNeeraj Singh2013-10-149-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `scope_chain` uses same array for building different `scope_chain` for different associations. During processing these arrays are sometimes mutated and because of in-place mutation the changed `scope_chain` impacts other reflections. Fix is to dup the value before adding to the `scope_chain`. Fixes #3882.
| * | | | | | | | | | | | | | | Merge pull request #12532 from vipulnsward/singleton_classRafael Mendonça França2013-10-141-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | Fix `singleton_class?`
| | * | | | | | | | | | | | | | Fix `singleton_class?`Vipul A M2013-10-151-2/+5
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to changes from http://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/39628 current `singleton_class?` implementation fails. Changed based on reference from http://bugs.ruby-lang.org/issues/7609
| * | | | | | | | | | | | | | Merge pull request #12530 from vipulnsward/remove_thread_safeRafael Mendonça França2013-10-141-13/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `$SAFE = 4;` has been removed with Ruby 2.1
| | * | | | | | | | | | | | | | `$SAFE = 4;` has been removed with Ruby 2.1Vipul A M2013-10-141-13/+0
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For background - https://bugs.ruby-lang.org/issues/8468 Changset - https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/41259/diff/test/ruby/test_thread.rb
| * | | | | | | | | | | | | | Merge pull request #12527 from vipulnsward/sqlite_database_typesRafael Mendonça França2013-10-141-18/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | SQLite3 Adapter datatypes cleanup
| | * | | | | | | | | | | | | Remove `default_primary_key_type` and extract contains of ↵Vipul A M2013-10-141-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `native_database_types` to a constant since they aren't conditional now in SQLite3Adapter. Makes it more like other adapters.
| * | | | | | | | | | | | | | Merge pull request #9499 from ↵Rafael Mendonça França2013-10-143-2/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dmitry/inverse_instance_should_not_be_reloaded_after_stale_state_change Inversed instance should not be reloaded after stale state was changed Conflicts: activerecord/CHANGELOG.md
| | * | | | | | | | | | | | | Add a note to the changelog for #9499Dmitry Polushkin2013-10-131-0/+6
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | add inversed accessor to association classDmitry Polushkin2013-10-131-2/+3
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | inversed instance should not be reloaded after stale state was changedDmitry Polushkin2013-10-132-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check at association reader that record is inverted and should not be reloaded because of stale was changed at target record
| * | | | | | | | | | | | | | Merge pull request #11833 from vipulnsward/remove_autoincrementRafael Mendonça França2013-10-142-15/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | Remove sqlite specific`supports_autoincrement?` which defaults to true
| | * | | | | | | | | | | | | Remove sqlite specific`supports_autoincrement?` which always defaults to trueVipul A M2013-08-102-15/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | cleanup changelog entry format. [ci skip]Yves Senn2013-10-141-2/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Extract a function to determine if the default value is a functionRafael Mendonça França2013-10-141-1/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Push default_function to superclass to avoid method checkRafael Mendonça França2013-10-143-15/+18
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Dump the default function when the primary key is uuidRafael Mendonça França2013-10-142-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12489
| * | | | | | | | | | | | | | Merge pull request #12486 from cjolly/newline-eof-structure-sqlRafael Mendonça França2013-10-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | newline at end of structure.sql file
| | * | | | | | | | | | | | | newline at end of structure.sql fileChad Jolly2013-10-131-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #12518 from vipulnsward/remove_count_optionsRafael Mendonça França2013-10-135-20/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Relation#count` doesn't use options anymore.
| | * | | | | | | | | | | | | | Stop accepting `options` for `Relation#average`, `Relation#minimum`, ↵Vipul A M2013-10-143-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Relation#maximum`, `Relation#calculate`, `perform_calculation`, `NullRelation#calculate` as they isn't used anymore.
| | * | | | | | | | | | | | | | `Relation#count` doesn't use options anymore.Vipul A M2013-10-133-8/+5
| | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 22:51:18 +0000