aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added nodoc to change_tableTom Kadwill2014-07-281-1/+1
* 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
|\ \
| * | 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
* | 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
| * | Revert "Document ActionController::TestCase::Behavior::ClassMethods.process"Vijay Dev2014-04-271-12/+0
| * | Revert "Revert "Revert "update doc, assert_template also accepts false"""Xavier Noria2014-04-211-1/+1
| * | Revert "Revert "update doc, assert_template also accepts false""Xavier Noria2014-04-211-1/+1
| * | Revert "update doc, assert_template also accepts false"Gaurish Sharma2014-04-211-1/+1
| * | Running AR tests on postgres, mysql & sqliteGaurish Sharma2014-04-211-10/+5
| * | Document ActionController::TestCase::Behavior::ClassMethods.processGaurish Sharma2014-04-201-0/+12
| * | update doc, assert_template also accepts falseGaurish Sharma2014-04-201-1/+1
| * | Remove reference to outdated section Gaurish Sharma2014-04-201-1/+1
| * | [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
* | | Merge pull request #14872 from jonatack/patch-7Vijay Dev2014-04-271-6/+11
|\ \ \
| * | | Grammar and formatting fixes in Form Helpers GuideJon Atack2014-04-251-6/+11
* | | | Merge pull request #14874 from arunagw/aa-warning-removed-missmatchedGuillermo Iguaran2014-04-261-2/+2
|\ \ \ \
| * | | | Warning removed for missmatched indentationArun Agrawal2014-04-261-2/+2
* | | | | Merge pull request #14875 from prathamesh-sonpatki/fix-extract-handler-format...Lauro Caetano2014-04-251-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix documentation of extract_handler_and_format_and_variant [ci skip]Prathamesh Sonpatki2014-04-261-1/+1