aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13640 from maginatics/fix_sqlite3_ensure_masterRafael Mendonça França2014-05-013-3/+27
|\ | | | | | | | | | | | | SQLite3: Always close statements. Conflicts: activerecord/CHANGELOG.md
| * SQLite3: Always close statements.Timur Alperovich2014-01-153-3/+27
| | | | | | | | | | | | SQLite3 adapter must make sure to close statements after queries. Fixes: #13631
* | Merge pull request #14928 from potomak/update-scaffold-form-templateRafael Mendonça França2014-05-011-5/+0
|\ \ | | | | | | Avoid unnecessary conditional block
| * | Avoid unnecessary conditional blockGiovanni Cappellotto2014-05-011-5/+0
| | | | | | | | | | | | | | | GeneratedAttribute#column_name checks already for reference? on the attribute returning the right name to use as symbol for label and field.
* | | Merge pull request #14922 from ↵Rafael Mendonça França2014-05-011-1/+5
|\ \ \ | | | | | | | | | | | | | | | | rizwanreza/add-selected-documentation-to-select-tag Add documentation to select_tag for :selected option
| * | | Add documentation to select_tag for :selected optionRizwan Reza2014-04-301-1/+5
| | | |
* | | | Merge pull request #14916 from ↵Matthew Draper2014-05-012-7/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | moktin/real_privacy_for_functions_in_predicate_builder Give real privacy to class methods in AR::PredicateBuilder
| * | | Give real privacy to class methods in AR::PredicateBuilderHector Satre2014-05-012-7/+12
|/ / /
* | | avoid calling extract_record multiple timesAaron Patterson2014-04-301-3/+2
| | |
* | | eliminate conditional when sending the named route methodAaron Patterson2014-04-301-2/+4
| | |
* | | do not allocate strings while creating urlsAaron Patterson2014-04-301-1/+1
| | |
* | | don't allocate string on hash accessAaron Patterson2014-04-301-1/+1
| | |
* | | split nil / Hash cases in url_forAaron Patterson2014-04-301-4/+4
|/ / | | | | | | | | | | | | this reduces the number of comparisons and method calls `url_for` requires. The nil case no longer calls `symbolize_keys`, we already know options is nil, so no more ||=, and since it is nil we already know that options[:host] will be nil too.
* | Merge pull request #14909 from jonatack/patch-7Arthur Nogueira Neves2014-04-291-2/+2
|\ \ | | | | | | the use of ... in place >> using ... instead
| * | the use of ... in place >> using ... insteadJon Atack2014-04-301-2/+2
|/ / | | | | [ci skip]
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 01:42:37 +0000