| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Ensure the state is clean after one failure | Rafael Mendonça França | 2013-10-16 | 1 | -5/+4 |
| | | |||||
| * | Merge pull request #12540 from wyaeld/bug/fix-recursive-digest | Rafael Mendonça França | 2013-10-16 | 3 | -6/+37 |
| |\ | | | | | | | Ensure ActionView::Digestor.cache is correctly cleaned up | ||||
| | * | add a new local variable to track if digests are being stored, to ensure the ↵ | Brad Murray | 2013-10-17 | 1 | -2/+2 |
| | | | | | | | | | cleanup works correctly | ||||
| | * | update digestor code based on review | Brad Murray | 2013-10-15 | 1 | -2/+2 |
| | | | |||||
| | * | update changelog | Brad Murray | 2013-10-15 | 1 | -0/+5 |
| | | | |||||
| | * | Ensure ActionView::Digest.cache is correctly cleaned up when | Brad Murray | 2013-10-15 | 1 | -6/+6 |
| | | | | | | | | | ActionView::Resolver.caching = false. | ||||
| | * | Add 2 tests, 1 of which fails, to isolate the digest_caching behaviour ↵ | Brad Murray | 2013-10-15 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | causing #12521 If config.action_view.cache_template_loading = false, most likely in a development configuration if config.cache_classes = false & config.action_controller.perform_caching = true. config.action_view.cache_template_loading defaults to the value of config.cache_classes | ||||
| * | | Merge pull request #12568 from adamyonk/patch-1 | Rafael Mendonça França | 2013-10-16 | 1 | -1/+1 |
| |\ \ | | | | | | | Fix typo in form_helper.rb | ||||
| | * | | Fix typo in form_helper.rb | Adam Jahnke | 2013-10-16 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #12545 from nateberkopec/rephrase_callback_warning | Yves Senn | 2013-10-16 | 1 | -1/+1 |
| |\ \ | | | | | | | Rephrase ActiveRecord transaction rollback warning [ci skip] | ||||
| | * | | Rephrase ActiveRecord transaction rollback warning | Nate Berkopec | 2013-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | [ci skip] | ||||
| * | | | Merge pull request #12558 from lucasmazza/changelog-fixes | Rafael Mendonça França | 2013-10-16 | 2 | -12/+12 |
| |\ \ \ | | | | | | | | | Fix code blocks identation on AR and AS CHANGELOGs | ||||
| | * | | | Fix code blocks identation on AR and AS CHANGELOGs | Lucas Mazza | 2013-10-16 | 2 | -12/+12 |
| |/ / / | |||||
| * | | | Merge pull request #12553 from tchandy/master | Guillermo Iguaran | 2013-10-15 | 1 | -95/+0 |
| |\ \ \ | | | | | | | | | Removing unused fake models from actionpack tests | ||||
| | * | | | Removing unused fake models from actionpack tests | Thiago Pradi | 2013-10-16 | 1 | -95/+0 |
| |/ / / | |||||
| * | | | use the cached arel table | Aaron Patterson | 2013-10-15 | 2 | -2/+2 |
| | | | | |||||
| * | | | Fix typo in the changelog entry | Rafael Mendonça França | 2013-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | [ci skip] | ||||
| * | | | 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 |
| | | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |