aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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
| * | | | | | | | Merge pull request #14825 from arunagw/aa-remove-missleading-commentArun Agrawal2014-04-201-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Changed miss-leading comment [ci skip]Arun Agrawal2014-04-201-1/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #14823 from kuldeepaggarwal/fix-inflector-exampleArun Agrawal2014-04-201-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | [ci-skip] correct the classify example's outputKuldeep Aggarwal2014-04-211-1/+1
| |/ / / / / /
* | | | | | | Revert "Edge Rails applications doesn't need to use arel master"Aaron Patterson2014-04-231-1/+2
* | | | | | | use statement cache for belongs_to relationsAaron Patterson2014-04-223-3/+17
* | | | | | | extract record fetching to a method for belongs_toAaron Patterson2014-04-221-1/+5
* | | | | | | Merge branch 'master' into adequaterecordAaron Patterson2014-04-2086-448/+1015
|\| | | | | |
| * | | | | | Merge pull request #14820 from akshay-vishnoi/doc_changesRichard Schneeman2014-04-206-8/+8
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | [ci skip] builtin -> built-inAkshay Vishnoi2014-04-206-8/+8
| * | | | | | Merge pull request #14821 from jonatack/patch-5Arthur Nogueira Neves2014-04-201-47/+63
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix code indentation and improve formattingJon Atack2014-04-201-47/+63
| |/ / / / /
| * | | | | Merge pull request #14816 from jonatack/patch-2Robin Dupret2014-04-201-1/+1
| |\ \ \ \ \
| | * | | | | Grammar fix in Getting Started GuideJon Atack2014-04-201-1/+1
| |/ / / / /
| * | | | | Make URL escaping more consistentAndrew White2014-04-208-10/+89
| * | | | | Optimize URI escapingAndrew White2014-04-201-17/+42
| * | | | | Always escape string passed to url helper.edogawaconan2014-04-202-3/+3
| * | | | | Merge pull request #14811 from qrush/masterGuillermo Iguaran2014-04-191-1/+1
| |\ \ \ \ \
| | * | | | | Remove statement assuming coffee shop/public space wifi is inherently insecureNick Quaranto2014-04-191-1/+1
| |/ / / / /
| * | | | | Merge pull request #14810 from robin850/patch-18Godfrey Chan2014-04-191-1/+0
| |\ \ \ \ \
| | * | | | | Don't rely on Arel master in bug report template [ci skip]Robin Dupret2014-04-191-1/+0
| |/ / / / /
| * | | | | Merge pull request #14805 from akshay-vishnoi/structure-changeAndrew White2014-04-191-0/+0
| |\ \ \ \ \
| | * | | | | multibyte_conformance.rb --> multibyte_conformance_test.rbAkshay Vishnoi2014-04-191-0/+0
| | |/ / / /
| * | | | | Merge pull request #14804 from akshay-vishnoi/doc_changesArthur Nogueira Neves2014-04-193-4/+4
| |\ \ \ \ \
| | * | | | | "subhash" --> "sub-hash"Akshay Vishnoi2014-04-193-4/+4
| | |/ / / /
| * | | | | Merge pull request #14808 from akalyaev/few-corrections-in-rails-initializati...Xavier Noria2014-04-191-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | wrap methods in backticks [ci skip]Anton Kalyaev2014-04-191-2/+2
| |/ / / /
| * | | | Merge pull request #14799 from ernie/string-first-last-fixRafael Mendonça França2014-04-182-4/+16
| |\ \ \ \
| | * | | | Fix inconsistent behavior from String#first/#lastErnie Miller2014-04-182-4/+16
| |/ / / /
| * | | | Merge pull request #14796 from kuldeepaggarwal/fix-save-issueYves Senn2014-04-183-0/+21
| |\ \ \ \