aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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]Jon Atack2014-05-021-1/+1
|/
* only add the optiosn if they are not emptyAaron Patterson2014-05-011-1/+3
* 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
* Merge pull request #14896 from jetthoughts/14895_overide_strict_by_sql_modeRafael Mendonça França2014-05-014-5/+30
|\
| * Stringify variables names for mysql connectionsPaul Nikitochkin2014-04-304-5/+30
* | Merge pull request #14932 from phoet/use_file_joinRafael Mendonça França2014-05-013-2/+20
|\ \
| * | 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.Kyle Heironimus2014-05-011-2/+2
|/ /
* | Merge pull request #14915 from juanpastas/patch-1Rafael Mendonça França2014-05-011-20/+37
|\ \
| * | [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 addressesCaleb Spare2013-10-263-2/+13
* | | | 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.Timur Alperovich2014-01-153-3/+27
* | | | | Merge pull request #14928 from potomak/update-scaffold-form-templateRafael Mendonça França2014-05-011-5/+0
|\ \ \ \ \
| * | | | | Avoid unnecessary conditional blockGiovanni Cappellotto2014-05-011-5/+0
| | |_|/ / | |/| | |
* | | | | Merge pull request #14922 from rizwanreza/add-selected-documentation-to-selec...Rafael Mendonça França2014-05-011-1/+5
|\ \ \ \ \
| * | | | | Add documentation to select_tag for :selected optionRizwan Reza2014-04-301-1/+5
* | | | | | Merge pull request #14916 from moktin/real_privacy_for_functions_in_predicate...Matthew Draper2014-05-012-7/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
|/ / /
* | | Merge pull request #14909 from jonatack/patch-7Arthur Nogueira Neves2014-04-291-2/+2
|\ \ \
| * | | the use of ... in place >> using ... insteadJon Atack2014-04-301-2/+2
|/ / /
* | | rewrites the API docs of favicon_link_tag [ci skip]Xavier Noria2014-04-291-9/+16
* | | Merge pull request #14905 from jonatack/patch-7Vijay Dev2014-04-291-36/+159
|\ \ \
| * | | Update the Getting Started tutorialJon Atack2014-04-291-36/+159
* | | | cleanup, remove trailing whitespace. [ci skip]Yves Senn2014-04-291-1/+1
|/ / /
* | | Merge pull request #14899 from eileencodes/fix-delete-all-with-nil-dependency...Aaron Patterson2014-04-284-8/+18
|\ \ \
| * | | add test to check that loaded and non laoded are the sameeileencodes2014-04-281-0/+13
| * | | clear shouldnt fire callbacks so remove order testeileencodes2014-04-281-3/+0
| * | | rewrite test to correctly test clear methodeileencodes2014-04-281-2/+2
| * | | flip conditional in delete_all to handle nullify bettereileencodes2014-04-281-3/+3
* | | | Merge pull request #14139 from anilmaurya/masterYves Senn2014-04-281-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] updating active_record/associations to demonstrate where conflict w...anilmaurya2014-04-291-0/+6
* | | | Merge pull request #14892 from eileencodes/breakup-complex-conditionals-on-de...Aaron Patterson2014-04-281-9/+9
|\ \ \ \
| * | | | simplify the delete all w/ dependency methodeileencodes2014-04-281-3/+3
| * | | | remove unnecessary code from delete methodeileencodes2014-04-281-10/+2
| * | | | write a new method to be accessed from delete_alleileencodes2014-04-281-1/+9
|/ / / /
* | | | Merge pull request #14890 from fuzzyalej/patch-1Arthur Nogueira Neves2014-04-281-0/+1
|\ \ \ \
| * | | | Added a missing `end`Alejandro Andrés2014-04-281-0/+1
|/ / / /
* | | | Merge pull request #14889 from kiela/masterArthur Nogueira Neves2014-04-281-1/+0
|\ \ \ \