aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Update guides license to CC BY-SA 4.0 International.Juanito Fatas2014-05-021-1/+1
| | | | Benefits: https://creativecommons.org/version4
* Follow up to 38ad5438 [ci skip]Robin Dupret2014-05-021-27/+36
| | | | | | | | | | | | | | This commit adds new lines between titles, paragraphs and code blocks for an easier reading. Moreover, in order to be consistent with the other guides, let's remove the sharps on the right side of the different titles. The "Running a Single Test" part was also explained after the "Testing Active Record" one which shows how to run a single test under the scope of a specific adapter. Finally, let's explain the `-n` option to run a specific test method.
* Enhance a bit a few changelog entries [ci skip]Robin Dupret2014-05-023-9/+10
|
* Merge pull request #14939 from jonatack/patch-8Damien Mathieu2014-05-021-1/+1
|\ | | | | Form_tag_helper grammar fix [skip ci]
| * Form_tag_helper grammar fix [skip ci]Jon Atack2014-05-021-1/+1
|/
* only add the optiosn if they are not emptyAaron Patterson2014-05-011-1/+3
| | | | | | I think this is wrong, but it gets the build passing for now. We should always add options, but we need to make more guarantees about how the underlying url helper is called
* always pass options to the _url methodAaron Patterson2014-05-012-6/+14
|
* never merge url options in to the first data hashAaron Patterson2014-05-011-1/+1
| | | | | if you want options, don't mix them with the first hash, just pass them all in with the second hash
* Merge pull request #14896 from jetthoughts/14895_overide_strict_by_sql_modeRafael Mendonça França2014-05-014-5/+30
|\ | | | | | | | | | | | | Symbolize variables of mysql/mysql2 connection configuration Conflicts: activerecord/CHANGELOG.md
| * Stringify variables names for mysql connectionsPaul Nikitochkin2014-04-304-5/+30
| | | | | | | | | | | | | | For mysql2/mysql adapters, `sql_mode` variable name set in `database.yml` as string, was ignored and `sql_mode` was set to use strict mode. Fixes #14895
* | Merge pull request #14932 from phoet/use_file_joinRafael Mendonça França2014-05-013-2/+20
|\ \ | | | | | | always use File.join in asset_path
| * | always use File.joinphoet2014-05-013-2/+20
| | |
* | | Merge pull request #14931 from heironimus/security_guide_clarityJeremy Kemper2014-05-011-2/+2
|\ \ \ | |/ / |/| | [ci skip] Security guide clarity.
| * | [ci skip] Security guide clarity.Kyle Heironimus2014-05-011-2/+2
|/ /
* | Merge pull request #14915 from juanpastas/patch-1Rafael Mendonça França2014-05-011-20/+37
|\ \ | | | | | | Update mapper.rb
| * | [skip ci] Document: required `via` option in `match` routing method.Juan David Pastas2014-04-301-20/+37
| | |
* | | Merge pull request #12651 from cespare/ipv6-remote-ip-fixesRafael Mendonça França2014-05-013-2/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make remote_ip detection properly handle private IPv6 addresses Conflicts: actionpack/CHANGELOG.md
| * | | Make remote_ip detection properly handle private IPv6 addressesCaleb Spare2013-10-263-2/+13
| | | | | | | | | | | | | | | | Fixes #12638.
* | | | Remove unused variableRafael Mendonça França2014-05-011-1/+1
| | | |
* | | | 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`
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 11:34:06 +0000