aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Remove deprecated `:distinct` option from `Relation#count`.Yves Senn2013-07-013-15/+4
|/ /
* | Merge pull request #11220 from aditya-kapoor/add-concernCarlos Antonio da Silva2013-07-011-4/+3
|\ \
| * | Using ActiveSupport::Concern instead of plain regular Ruby hooks in railties/...aditya-kapoor2013-07-011-4/+3
* | | Merge pull request #11221 from neerajdotname/partial_updates_familyCarlos Antonio da Silva2013-07-013-25/+5
|\ \ \
| * | | Removed deprecated methods partial_updates and familyNeeraj Singh2013-07-023-25/+5
|/ / /
* | | Merge pull request #11213 from neerajdotname/scoped-deprecatedRafael Mendonça França2013-07-012-5/+4
|\ \ \
| * | | Removed deprecated method scopedNeeraj Singh2013-07-012-5/+4
* | | | Merge pull request #11212 from neerajdotname/default_scopes_q_deprecatedRafael Mendonça França2013-07-012-8/+4
|\ \ \ \
| * | | | Removed deprecated method default_scopes?Neeraj Singh2013-07-012-8/+4
* | | | | Merge pull request #11203 from schneems/schneems/plugin_new-pluginRafael Mendonça França2013-07-0135-16/+20
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | s/plugin_new/pluginschneems2013-06-3035-16/+20
* | | | | Merge pull request #11207 from vipulnsward/remove_escapesCarlos Antonio da Silva2013-07-011-6/+6
|\ \ \ \ \
| * | | | | Remove redundant escapes from xml serialization testVipul A M2013-07-011-6/+6
| | |/ / / | |/| | |
* | | | | Merge pull request #11211 from gsamokovarov/trailing-commaGuillermo Iguaran2013-07-011-10/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Further clean-up of ActiveSupport::CallbacksGenadi Samokovarov2013-07-011-10/+9
| |/ / /
* | | | Merge pull request #10099 from wangjohn/railties_each_with_config_2nd_attemptSantiago Pastorino2013-07-012-7/+226
|\ \ \ \ | |/ / / |/| | |
| * | | Allowing multiple rails applications in the same ruby instance.wangjohn2013-06-302-7/+226
|/ / /
* | | Merge pull request #11195 from yangchenyun/update_doc_for_define_callbacksCarlos Antonio da Silva2013-06-301-13/+14
|\ \ \
| * | | unified the param names across all callbacks manipulation methodsSteven Yang2013-07-011-10/+10
| * | | updated AS:Callbacks doc for terminator option in define_callbacks methodSteven Yang2013-06-301-3/+4
| | |/ | |/|
* | | Merge pull request #11205 from Gawyn/using-preferred-find_by-syntax-in-guidesCarlos Antonio da Silva2013-06-305-10/+10
|\ \ \
| * | | Using preferred find_by syntax in guidesCristian Planas2013-07-015-10/+10
| | |/ | |/|
* | | Merge pull request #11204 from Gawyn/find_by-triggers-after_findCarlos Antonio da Silva2013-06-301-0/+1
|\ \ \
| * | | Adding find_by in guide to methods that trigger after_findCristian Planas2013-07-011-0/+1
| |/ /
* | | Merge pull request #11192 from charliesome/extra-roflscaleCarlos Antonio da Silva2013-06-301-1/+1
|\ \ \ | |/ / |/| |
| * | store a symbol directly inside DISPATCH_CACHE for extra roflscaleCharlie Somerville2013-06-301-1/+1
* | | fix typo in ActiveModel::Error docs [ci skip]Steven Yang2013-06-301-1/+1
* | | Merge pull request #11196 from yangchenyun/remove_evals_in_am_callbacksCarlos Antonio da Silva2013-06-301-1/+3
|\ \ \
| * | | remove evals from AM::Validations::CallbacksSteven Yang2013-06-301-1/+3
| | |/ | |/|
* | | Merge pull request #11186 from jetthoughts/synchronize_create_method_bodyYves Senn2013-06-301-9/+34
|\ \ \
| * | | Synchronize PostController#create code from 5.6 to others sections. [ci skip]Paul Nikitochkin2013-06-301-9/+34
| | |/ | |/|
* | | don't shadow `through_scope` method name with local var.Yves Senn2013-06-301-7/+7
* | | Merge pull request #11180 from robin850/patch-5Yves Senn2013-06-301-20/+5
|\ \ \
| * | | Remove a duplicated section [ci skip]Robin Dupret2013-06-291-20/+5
* | | | Merge pull request #11189 from jetthoughts/destroy_link_description_for_getti...Yves Senn2013-06-301-3/+3
|\ \ \ \
| * | | | Added clarification for destroy link_to description in 5.14 [ci skip]Paul Nikitochkin2013-06-301-3/+3
| | |/ / | |/| |
* | | | Merge pull request #11190 from dkaplan88/typoYves Senn2013-06-301-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Typo in Active Record Migrations Guide [ci skip]dkaplan882013-06-291-1/+1
| |/ /
* / / Clean the code a bitSantiago Pastorino2013-06-292-2/+2
|/ /
* | Merge pull request #11176 from schneems/schneems/plugin_new_help_fixRafael Mendonça França2013-06-292-9/+11
|\ \ | |/ |/|
| * Fix `rails plugin --help`schneems2013-06-292-9/+11
* | Merge pull request #11177 from yangchenyun/mineJosé Valim2013-06-291-8/+8
|\ \
| * | provide a more sementicthe local variables name for ActiveModel::Validations:...Steven Yang2013-06-291-8/+8
* | | Merge pull request #11156 from JonRowe/fix_tags_picking_string_keys_from_non_...Rafael Mendonça França2013-06-294-2/+23
|\ \ \ | |/ / |/| |
| * | fetch value(s) from stringified optionsJon Rowe2013-06-294-2/+23
* | | Merge pull request #11152 from senny/remove_implicit_join_referencesSteve Klabnik2013-06-296-87/+25
|\ \ \
| * | | remove deprecated implicit join references.Yves Senn2013-06-296-87/+25
| | |/ | |/|
* | | Merge pull request #11175 from robin850/patch-4Steve Klabnik2013-06-291-1/+1
|\ \ \ | |/ / |/| |
| * | Update a broken link into the fixtures' templateRobin Dupret2013-06-291-1/+1
|/ /
* | use bytesize rather than force encodingAaron Patterson2013-06-281-2/+1