| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Don't remove the select values to add they back again | Rafael Mendonça França | 2013-10-15 | 1 | -1/+1 |
| | | | | | | Conflicts: activerecord/lib/active_record/relation/finder_methods.rb | ||||
| * | Merge pull request #12547 from derekprior/dp-fix-null-relation-pluck | Rafael Mendonça França | 2013-10-15 | 3 | -2/+9 |
| |\ | | | | | Pluck on NullRelation should accept a list of columns | ||||
| | * | Pluck on NullRelation accepts a list of columns | Derek Prior | 2013-10-15 | 3 | -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`. | ||||
| * | | grammar fix (reverted in e9a1ecd) | Vijay Dev | 2013-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-10-15 | 1 | -1/+1 |
| |\ \ | |/ |/| | |||||
| | * | Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no ↵ | Vijay Dev | 2013-10-15 | 1 | -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 Scott | 2013-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no longer ↵ | Zachary Scott | 2013-09-28 | 1 | -1/+1 |
| | | | | | | | | | depends on/ | ||||
| * | | Merge pull request #12524 from kirs/patch-1 | Rafael Mendonça França | 2013-10-15 | 1 | -1/+1 |
| |\ \ | | | | | | | Prepare generated Gemfile for Capistrano 3 | ||||
| | * | | Prepare generated Gemfile for Capistrano 3 | Kir Shatrov | 2013-10-15 | 1 | -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_require | Rafael Mendonça França | 2013-10-15 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | Add missed require making `enable_warnings` available | ||||
| | * | | | Add missed require making `enable_warnings` available | Dmitry Vorotilin | 2013-10-15 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Merge pull request #11432 from yalab/generate_model_name_option | Yves Senn | 2013-10-15 | 5 | -6/+53 |
| |\ \ \ | | | | | | | | | Add --model-name option into scaffold_controller generator | ||||
| | * | | | Added --model-name option scaffold_controller_generator. | yalab | 2013-10-15 | 5 | -6/+53 |
| |/ / / | |||||
| * | | | Merge pull request #12534 from vipulnsward/minor_number_helper_perfs | Rafael Mendonça França | 2013-10-14 | 1 | -4/+2 |
| |\ \ \ | | | | | | | | | Minor Refactoring to `NumberHelper#number_to_human` | ||||
| | * | | | Minor Refactoring to `NumberHelper#number_to_human` | Vipul A M | 2013-10-14 | 1 | -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 sending | Aaron Patterson | 2013-10-14 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | we should have unique sponsorable ids in the fixtures at least | Aaron Patterson | 2013-10-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #12536 from sbagdat/patch-1 | Rafael Mendonça França | 2013-10-14 | 1 | -2/+0 |
| |\ \ \ \ | | | | | | | | | | | Remove size alias for length validation | ||||
| | * | | | | Remove size alias for length validation | Sıtkı Bağdat | 2013-10-14 | 1 | -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 hash | Aaron Patterson | 2013-10-14 | 1 | -10/+5 |
| | | | | | |||||
| * | | | | the preloader for the RHS has all the preloaded records, so ask it | Aaron Patterson | 2013-10-14 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | only calculate offset index once. #12537 | Aaron Patterson | 2013-10-14 | 1 | -6/+10 |
| | | | | | |||||
| * | | | | Merge pull request #10538 from neerajdotname/3882 | Rafael Mendonça França | 2013-10-14 | 9 | -1/+65 |
| |\ \ \ \ | | | | | | | | | | | scope_chain should not be mutated for other reflections | ||||
| | * | | | | scope_chain should not be mutated for other reflections | Neeraj Singh | 2013-10-14 | 9 | -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_class | Rafael Mendonça França | 2013-10-14 | 1 | -2/+5 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Fix `singleton_class?` | ||||
| | * | | | | Fix `singleton_class?` | Vipul A M | 2013-10-15 | 1 | -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_safe | Rafael Mendonça França | 2013-10-14 | 1 | -13/+0 |
| |\ \ \ \ | | | | | | | | | | | `$SAFE = 4;` has been removed with Ruby 2.1 | ||||
| | * | | | | `$SAFE = 4;` has been removed with Ruby 2.1 | Vipul A M | 2013-10-14 | 1 | -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_types | Rafael Mendonça França | 2013-10-14 | 1 | -18/+16 |
| |\ \ \ \ | |/ / / |/| | | | SQLite3 Adapter datatypes cleanup | ||||
| | * | | | Remove `default_primary_key_type` and extract contains of ↵ | Vipul A M | 2013-10-14 | 1 | -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ça | 2013-10-14 | 3 | -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 #9499 | Dmitry Polushkin | 2013-10-13 | 1 | -0/+6 |
| | | | | | |||||
| | * | | | add inversed accessor to association class | Dmitry Polushkin | 2013-10-13 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | inversed instance should not be reloaded after stale state was changed | Dmitry Polushkin | 2013-10-13 | 2 | -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_autoincrement | Rafael Mendonça França | 2013-10-14 | 2 | -15/+3 |
| |\ \ \ \ | |_|/ / |/| | | | Remove sqlite specific`supports_autoincrement?` which defaults to true | ||||
| | * | | | Remove sqlite specific`supports_autoincrement?` which always defaults to true | Vipul A M | 2013-08-10 | 2 | -15/+3 |
| | | | | | |||||
| * | | | | cleanup changelog entry format. [ci skip] | Yves Senn | 2013-10-14 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | Extract a function to determine if the default value is a function | Rafael Mendonça França | 2013-10-14 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | Push default_function to superclass to avoid method check | Rafael Mendonça França | 2013-10-14 | 3 | -15/+18 |
| | | | | | |||||
| * | | | | Dump the default function when the primary key is uuid | Rafael Mendonça França | 2013-10-14 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | Fixes #12489 | ||||
| * | | | | Merge pull request #12486 from cjolly/newline-eof-structure-sql | Rafael Mendonça França | 2013-10-13 | 1 | -0/+1 |
| |\ \ \ \ | |_|/ / |/| | | | newline at end of structure.sql file | ||||
| | * | | | newline at end of structure.sql file | Chad Jolly | 2013-10-13 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #12518 from vipulnsward/remove_count_options | Rafael Mendonça França | 2013-10-13 | 5 | -20/+17 |
| |\ \ \ \ | | | | | | | | | | | `Relation#count` doesn't use options anymore. | ||||
| | * | | | | Stop accepting `options` for `Relation#average`, `Relation#minimum`, ↵ | Vipul A M | 2013-10-14 | 3 | -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 M | 2013-10-13 | 3 | -8/+5 |
| | | | | | | |||||
| * | | | | | Add nodoc to method | Rafael Mendonça França | 2013-10-13 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #12508 from ↵ | Rafael Mendonça França | 2013-10-13 | 4 | -2/+40 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/12415_generate_subqueries_for_relation_from_binding_params Generate subquery for Relation passed as array condition for where Conflicts: activerecord/CHANGELOG.md | ||||
| | * | | | | | Generate subquery for Relation passed as array condition for where | Paul Nikitochkin | 2013-10-13 | 4 | -2/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of executing 2 queries for fetching records filtered by array condition with Relation, added generation of subquery to current query. This behaviour will be consistent when passes Relation as hash condition to where Closes: #12415 | ||||
| * | | | | | | Merge pull request #12456 from razielgn/ar-test-fixes | Rafael Mendonça França | 2013-10-13 | 3 | -5/+11 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed MRI dependent stuff in AR tests | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |