aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | 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
* | | | | | | Merge pull request #14853 from kassio/kb-fix-custom-join-table-habtmYves Senn2014-04-254-2/+15
|\ \ \ \ \ \ \
| * | | | | | | Fix custom join_table name on habtm reflectionsKassio Borges2014-04-254-2/+15
| |/ / / / / /
* | | | | | | Merge pull request #14873 from jonatack/patch-8Yves Senn2014-04-251-5/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix code & grammar in Form Helpers GuideJon Atack2014-04-251-5/+5
|/ / / / / /
* | | | | | Merge branch 'master' into adequaterecordAaron Patterson2014-04-2539-380/+634
|\| | | | |
| * | | | | move AR length validation tests into separate test-case.Yves Senn2014-04-242-42/+48
| * | | | | No need for trailing slash on migration path.Jeremy Kemper2014-04-241-1/+1
| * | | | | reset `@arel` when modifying a Relation in place.Yves Senn2014-04-243-1/+18
| * | | | | Merge pull request #14859 from jefflai2/datetime_typeYves Senn2014-04-242-6/+15
| |\ \ \ \ \
| | * | | | | PostgreSQL Timestamps always map to `:datetime`.Jefferson Lai2014-04-242-6/+15
| * | | | | | Merge pull request #14856 from Gaurav2728/gaurav-typo_fixSantiago Pastorino2014-04-241-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | [ci skip] Improve formatting and ymlGaurav Sharma2014-04-241-2/+2
| |/ / / / /
| * | | | | Merge pull request #14858 from ebouchut/patch-1Robin Dupret2014-04-241-1/+1
| |\ \ \ \ \
| | * | | | | Fix a typo in the doc of forty_two AR FinderMethodEric Bouchut2014-04-241-1/+1
| |/ / / / /
| * | | | | Merge pull request #14843 from tgxworld/improve_readability_of_contributing_t...Santiago Pastorino2014-04-231-5/+5
| |\ \ \ \ \
| | * | | | | Improve readability of contributing to rails guide. [ci skip]Guo Xiang Tan2014-04-231-5/+5
| * | | | | | Merge pull request #14852 from matthewd/fix_build_for_assetsRafael Mendonça França2014-04-231-2/+2
| |\ \ \ \ \ \
| | * | | | | | Precompile the image we're referencing, too.Matthew Draper2014-04-241-2/+2
| |/ / / / / /
| * | | | | | Merge pull request #14842 from lucasmazza/lm-no-touching-callbacksYves Senn2014-04-233-2/+27
| |\ \ \ \ \ \
| | * | | | | | `ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty ...Lucas Mazza2014-04-233-2/+27
| | |/ / / / /
| * | | | | | Merge pull request #14850 from chancancode/fix_json_cookie_jarGuillermo Iguaran2014-04-233-2/+132
| |\ \ \ \ \ \
| | * | | | | | Fixed an issue with migrating legacy json cookies.Godfrey Chan2014-04-233-2/+132
| |/ / / / / /
| * | | | | | Merge pull request #14840 from akshay-vishnoi/doc_changesArthur Nogueira Neves2014-04-231-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Correct comment [ci skip]Akshay Vishnoi2014-04-231-2/+2
| * | | | | | Perfer to define methods instead of calling testRafael Mendonça França2014-04-221-4/+4
| * | | | | | Fix syntax errorRafael Mendonça França2014-04-221-0/+1