aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Convert Fixnum into String the port number in MySQLKenta Okamoto2013-10-183-1/+15
|
* Merge pull request #12569 from arthurnn/autosave_small_cleanipRafael Mendonça França2013-10-171-196/+196
|\ | | | | Small cleanup on autosave association
| * Fix some indentation on autosave associationArthur Neves2013-10-171-196/+196
| |
| * Make define_non_cyclic_method simplerArthur Neves2013-10-171-7/+7
| |
* | Merge pull request #12218 from dv/add-sass-globbing-to-asset-pipeline-docsYves Senn2013-10-171-1/+5
|\ \ | |/ |/| Add sass globbing to asset pipeline docs [ci skip]
| * Add Sass gobbling info to asset pipeline docsDavid Verhasselt2013-10-171-1/+5
| | | | | | | | [ci skip]
* | Merge pull request #12564 from JuanitoFatas/association-basicsYves Senn2013-10-161-8/+8
|\ \ | | | | | | [ci skip] Fix number of methods added by association.
| * | [ci skip] Fix number of methods added by association.Juanito Fatas2013-10-171-8/+8
| | | | | | | | | | | | Also clean up some trailing spaces on line 1143-1146.
* | | Ensure the state is clean after one failureRafael Mendonça França2013-10-161-5/+4
| | |
* | | Merge pull request #12540 from wyaeld/bug/fix-recursive-digestRafael Mendonça França2013-10-163-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 Murray2013-10-171-2/+2
| | | | | | | | | | | | | | | | cleanup works correctly
| * | | update digestor code based on reviewBrad Murray2013-10-151-2/+2
| | | |
| * | | update changelogBrad Murray2013-10-151-0/+5
| | | |
| * | | Ensure ActionView::Digest.cache is correctly cleaned up whenBrad Murray2013-10-151-6/+6
| | | | | | | | | | | | | | | | ActionView::Resolver.caching = false.
| * | | Add 2 tests, 1 of which fails, to isolate the digest_caching behaviour ↵Brad Murray2013-10-151-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-1Rafael Mendonça França2013-10-161-1/+1
|\ \ \ \ | |_|/ / |/| | | Fix typo in form_helper.rb
| * | | Fix typo in form_helper.rbAdam Jahnke2013-10-161-1/+1
|/ / /
* | | Merge pull request #12545 from nateberkopec/rephrase_callback_warningYves Senn2013-10-161-1/+1
|\ \ \ | | | | | | | | Rephrase ActiveRecord transaction rollback warning [ci skip]
| * | | Rephrase ActiveRecord transaction rollback warningNate Berkopec2013-10-161-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #12558 from lucasmazza/changelog-fixesRafael Mendonça França2013-10-162-12/+12
|\ \ \ \ | | | | | | | | | | Fix code blocks identation on AR and AS CHANGELOGs
| * | | | Fix code blocks identation on AR and AS CHANGELOGsLucas Mazza2013-10-162-12/+12
|/ / / /
* | | | Merge pull request #12553 from tchandy/masterGuillermo Iguaran2013-10-151-95/+0
|\ \ \ \ | | | | | | | | | | Removing unused fake models from actionpack tests
| * | | | Removing unused fake models from actionpack testsThiago Pradi2013-10-161-95/+0
|/ / / /
* | | | 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`.
* | | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-16 11:16:24 +0000