aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* rewrites the API docs of favicon_link_tag [ci skip]Xavier Noria2014-04-291-9/+16
| | | | Motivated by #14907.
* Merge pull request #14905 from jonatack/patch-7Vijay Dev2014-04-291-36/+159
|\ | | | | Update the Getting Started tutorial
| * Update the Getting Started tutorialJon Atack2014-04-291-36/+159
| | | | | | | | | | | | | | | | Update the Getting Started tutorial to clarify where and how to add controller actions, and fix some grammar. This PR is an improved version of #14828, #14822 and #14815. [skip ci]
* | cleanup, remove trailing whitespace. [ci skip]Yves Senn2014-04-291-1/+1
|/
* Merge pull request #14899 from ↵Aaron Patterson2014-04-284-8/+18
|\ | | | | | | | | eileencodes/fix-delete-all-with-nil-dependency-to-not-produce-in-statement Fix delete all with nil (:nullify) dependency to not produce in statement
| * add test to check that loaded and non laoded are the sameeileencodes2014-04-281-0/+13
| | | | | | | | | | | | | | Test checks that SQL is the same for a loaded vs not loaded association (category.categorizations, category.categorization.delete_all vs category.cartegroization.delete_al). This was fixed for delete_all dependency but was not fixed for no (:nullify, or nil) dependency).
| * clear shouldnt fire callbacks so remove order testeileencodes2014-04-281-3/+0
| | | | | | | | | | | | Since clear shouldn't fire callbacks the order doesn't matter since it was never updated. Remove the portion of this test that tests for order after clear.
| * rewrite test to correctly test clear methodeileencodes2014-04-281-2/+2
| | | | | | | | | | | | | | Clear should not call callbacks because it clear calls delete_all and then returns self. It should behave the same as delete_all. This test clarifies the goal of the test and tests the correct outcome.
| * flip conditional in delete_all to handle nullify bettereileencodes2014-04-281-3/+3
| | | | | | | | | | | | | | | | Nullify (or nil dependency) was doing the same thing delete_all was doing in issue #14546, creating a large IN statement if the association was loaded. Loaded and not loaded associations should behave the same. The IN statement is also not great because it's inefficient.
* | Merge pull request #14139 from anilmaurya/masterYves Senn2014-04-281-0/+6
|\ \ | |/ |/| [ci skip] updating active_record/associations to demonstrate where conflict with eager loading.
| * [ci skip] updating active_record/associations to demonstrate where conflict ↵anilmaurya2014-04-291-0/+6
| | | | | | | | with eager loading.
* | Merge pull request #14892 from ↵Aaron Patterson2014-04-281-9/+9
|\ \ | | | | | | | | | | | | eileencodes/breakup-complex-conditionals-on-delete Breakup complex conditionals on delete
| * | simplify the delete all w/ dependency methodeileencodes2014-04-281-3/+3
| | | | | | | | | | | | | | | | | | | | | After reviewing this code I realized the conditional that was there previously was basically saying if the dependency is not delete all. This is a better, cleaner, and clearer way to write this method.
| * | remove unnecessary code from delete methodeileencodes2014-04-281-10/+2
| | | | | | | | | | | | | | | Now that we have a new method delete_all_with_dependency this coupled conditional is no longer needed.
| * | write a new method to be accessed from delete_alleileencodes2014-04-281-1/+9
|/ / | | | | | | | | | | The delete method is very coupled with delete all even though only a portion of the conditionals apply. Decoupling this will make the code easier to understand and manipulate.
* | Merge pull request #14890 from fuzzyalej/patch-1Arthur Nogueira Neves2014-04-281-0/+1
|\ \ | | | | | | Added a missing `end`
| * | Added a missing `end`Alejandro Andrés2014-04-281-0/+1
|/ /
* | Merge pull request #14889 from kiela/masterArthur Nogueira Neves2014-04-281-1/+0
|\ \ | | | | | | Remove double declaration of memcache services on travis
| * | Remove double declaration of memcache services on travisKamil Kieliszczyk2014-04-281-1/+0
|/ /
* | Revert "Don't rely on Arel master in bug report template [ci skip]"Godfrey Chan2014-04-271-0/+1
| | | | | | | | | | | | This reverts commit fd6d7835. We are back on arel master, see b395265f.
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-04-272-1/+55
|\ \
| * | Revert "Running AR tests on postgres, mysql & sqlite"Vijay Dev2014-04-271-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 28bd442034e0974d0a4d664076dafb8e9555816d. Reason: Existing text was clearer imo. [ci skip]
| * | Revert "Document ActionController::TestCase::Behavior::ClassMethods.process"Vijay Dev2014-04-271-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2aef9fddf8b4487a05638ea3341dfd65ceb229ef. Reason: The added change isn't clear in terms of explaining the arguments. Will ask the author to provide a PR and take it forward. [ci skip]
| * | Revert "Revert "Revert "update doc, assert_template also accepts false"""Xavier Noria2014-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Revert Festival! I reverted a reverted commit, undo. This reverts commit 07ea37763d62e57d5709ab37da01b2848d12edd5.
| * | Revert "Revert "update doc, assert_template also accepts false""Xavier Noria2014-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: docrails policy is very strict about code. No matter how innocent the change, if it is not documentation it needs to go through a PR to rails/rails. Plase see the warning box at the bottom of http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#contributing-to-the-rails-documentation This reverts commit e1c5d24369440857de1402d61c85d982b29d8019.
| * | Revert "update doc, assert_template also accepts false"Gaurish Sharma2014-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9b1c077c91f09b64b8105f31fdf5240cd12c2e16. my bad. `assert_template` only accepts a String, Symbol, Hash, Regexp or nil. `false`(layout: false) is provided as a Hash.
| * | Running AR tests on postgres, mysql & sqliteGaurish Sharma2014-04-211-10/+5
| | | | | | | | | [ci skip]
| * | Document ActionController::TestCase::Behavior::ClassMethods.processGaurish Sharma2014-04-201-0/+12
| | | | | | | | | [ci skip]
| * | update doc, assert_template also accepts falseGaurish Sharma2014-04-201-1/+1
| | | | | | | | | [ci skip]
| * | Remove reference to outdated section Gaurish Sharma2014-04-201-1/+1
| | | | | | | | | [ci skip]
| * | [ci skip] Added example for number_field_tag methodZENATI YASSINE2014-04-191-0/+28
| | |
| * | [ci skip] Added example for date_field_tag methodZENATI YASSINE2014-04-191-0/+13
| | |
| * | [ci skip] Added example for email_field_tag methodZENATI YASSINE2014-04-191-0/+13
| | |
* | | Generators, remove leftover variable assignment. refs #14877Yves Senn2014-04-271-1/+0
| | | | | | | | | | | | | | | The last uses of this variable was removed with the `--builder` option. 2da5ea1c9feb4a7b491bd00bd6ffd931b9203da8
* | | Merge pull request #14872 from jonatack/patch-7Vijay Dev2014-04-271-6/+11
|\ \ \ | | | | | | | | Grammar and formatting fixes in Form Helpers Guide
| * | | Grammar and formatting fixes in Form Helpers GuideJon Atack2014-04-251-6/+11
| | | | | | | | | | | | | | | | | | | | Improved version of #14851 after helpful feedback from @robin850 and @matthewd. [skip ci]
* | | | Merge pull request #14874 from arunagw/aa-warning-removed-missmatchedGuillermo Iguaran2014-04-261-2/+2
|\ \ \ \ | | | | | | | | | | Warning removed for missmatched indentation
| * | | | Warning removed for missmatched indentationArun Agrawal2014-04-261-2/+2
| | | | |
* | | | | Merge pull request #14875 from ↵Lauro Caetano2014-04-251-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | prathamesh-sonpatki/fix-extract-handler-format-variant-doc Fix documentation of extract_handler_and_format_and_variant [ci skip]
| * | | | Fix documentation of extract_handler_and_format_and_variant [ci skip]Prathamesh Sonpatki2014-04-261-1/+1
| | | | |
* | | | | Merge pull request #14853 from kassio/kb-fix-custom-join-table-habtmYves Senn2014-04-254-2/+15
|\ \ \ \ \ | | | | | | | | | | | | Fix to use custom join table in habtm
| * | | | | Fix custom join_table name on habtm reflectionsKassio Borges2014-04-254-2/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | When used a custom join_table name on a habtm, rails was not saving it on Reflections. This causes a problem when rails loads fixtures, because it uses the reflections to set database with fixtures.
* | | | | Merge pull request #14873 from jonatack/patch-8Yves Senn2014-04-251-5/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Fix code & improve grammar in "Forms to External Resources" [ci skip]
| * | | | Fix code & grammar in Form Helpers GuideJon Atack2014-04-251-5/+5
|/ / / / | | | | | | | | in the "Forms to External Resources" section [skip ci]
* | | | Merge branch 'master' into adequaterecordAaron Patterson2014-04-2539-380/+634
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (28 commits) move AR length validation tests into separate test-case. No need for trailing slash on migration path. reset `@arel` when modifying a Relation in place. PostgreSQL Timestamps always map to `:datetime`. [ci skip] Improve formatting and yml Fix a typo in the doc of forty_two AR FinderMethod Improve readability of contributing to rails guide. [ci skip] Precompile the image we're referencing, too. `ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty transactions. Fixed an issue with migrating legacy json cookies. Correct comment [ci skip] Perfer to define methods instead of calling test Fix syntax error Add CHANGELOG entry for #14757 [ci skip] Fix run-on sentences and improve grammar [skip ci] Add test for using ActionView::Helpers::FormHelper.label with block and html select! renamed to avoid name collision Array#select! Rearrange deck chairs on the titanic. Organize connection handling test cases. Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon. ActionController::Renderers documentation fix ...
| * | | move AR length validation tests into separate test-case.Yves Senn2014-04-242-42/+48
| | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/validations/association_validation_test.rb
| * | | No need for trailing slash on migration path.Jeremy Kemper2014-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Causes a double // in Dir.glob that breaks Ruby 2.2-trunk. Not really a bug, but not relevant to this test either. Originally added in ed21f0c50270139ddb6993acfdaea4586ffd09a3
| * | | reset `@arel` when modifying a Relation in place.Yves Senn2014-04-243-1/+18
| | | | | | | | | | | | | | | | /cc @tenderlove
| * | | Merge pull request #14859 from jefflai2/datetime_typeYves Senn2014-04-242-6/+15
| |\ \ \ | | | | | | | | | | PostgreSQL Timestamps always map to `:datetime`.
| | * | | PostgreSQL Timestamps always map to `:datetime`.Jefferson Lai2014-04-242-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PG Adapter should use `:datetime` consistently instead of mapping mispellings to `:timestamp`. See #14513
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 14:13:14 +0000