aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | 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
| * | | | | | | | | Add CHANGELOG entry for #14757 [ci skip]Rafael Mendonça França2014-04-221-0/+6
| * | | | | | | | | Merge pull request #14757 from estsauver/14752Rafael Mendonça França2014-04-225-6/+19
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | select! renamed to avoid name collision Array#select!Earl J St Sauver2014-04-215-6/+19
| * | | | | | | | | | Merge pull request #14573 from habermann24/has_many_through_fixRafael Mendonça França2014-04-225-2/+30
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Minor improvement: Use the merge method on the relation instead of instance_e...Jan Habermann2014-04-031-1/+1
| | * | | | | | | | | | Simplify the code in target_scopeJan Habermann2014-04-031-5/+2
| | * | | | | | | | | | Add a CHANGELOG entry for the has_many :through scoping fix (See #14537 for d...Jan Habermann2014-04-031-0/+9
| | * | | | | | | | | | Properly handle scoping with has_many :through. Fixes #14537.Jan Habermann2014-04-034-2/+25
| * | | | | | | | | | | Merge pull request #14801 from kuldeepaggarwal/fix-string-inflectionRafael Mendonça França2014-04-222-1/+6
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix inconsistent behavior from String#pluralizeKuldeep Aggarwal2014-04-192-1/+6
| * | | | | | | | | | | | Merge pull request #14836 from jonatack/patch-5Yves Senn2014-04-221-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix run-on sentences and improve grammar [skip ci]Jon Atack2014-04-221-8/+8
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #13335 from glorieux/favicon_link_tag_mimetypeRafael Mendonça França2014-04-223-6/+21
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to imag...glorieux2014-04-213-6/+21
| * | | | | | | | | | | | | Merge pull request #10764 from mokevnin/replace_class_eval_by_define_methodRafael Mendonça França2014-04-221-35/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | replace class_eval by define_method in abstract_controller/callbackskirill2014-04-201-35/+29
| * | | | | | | | | | | | | | Merge pull request #14835 from zzak/test_form_helper_label_with_block_and_htmlRafael Mendonça França2014-04-222-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Add test for using ActionView::Helpers::FormHelper.label with block and htmlZachary Scott2014-04-222-0/+8
| |/ / / / / / / / / / / / / /
| * | / / / / / / / / / / / / Rearrange deck chairs on the titanic. Organize connection handling test cases.Jeremy Kemper2014-04-214-249/+246
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #14826 from stevegraham/action_controller_renderer_doc_fixArthur Nogueira Neves2014-04-201-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | ActionController::Renderers documentation fixStevie Graham2014-04-201-2/+2