aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
* | writing the new body can cause the response to be committed and theAaron Patterson2013-06-281-1/+3
* | Merge pull request #11160 from wangjohn/documentation_for_railties_initializa...Vijay Dev2013-06-281-8/+21
|\ \
| * | Adding documentation to the Rails initialization guide. [ci skip]wangjohn2013-06-261-8/+21
|/ /
* | Merge pull request #11163 from nfedyashev/omit_turbolinks_on_javascript_skip_...Carlos Antonio da Silva2013-06-283-3/+17
|\ \
| * | Omit turbolinks configuration completely on skip_javascript generator optionNikita Fedyashev2013-06-283-3/+17
* | | Merge pull request #11161 from dmitry/find_in_batches_works_without_loggerCarlos Antonio da Silva2013-06-282-2/+12
|\ \ \
| * | | find_in_batches should work without loggerDmitry Polushkin2013-06-282-2/+12
* | | | Remove order_values argument now that default_scope is simplifiedCarlos Antonio da Silva2013-06-281-5/+5
* | | | Simplify/fix implementation of default scopesJon Leighton2013-06-2812-74/+31
* | | | Merge pull request #11104 from drewda/patch-1Carlos Antonio da Silva2013-06-281-0/+2
|\ \ \ \
| * | | | adding additional plugins for debugging [ci skip]Drew Dara-Abrams2013-06-271-0/+2
* | | | | Fix layouts and rendering guide example using flash.now insteadCarlos Antonio da Silva2013-06-281-1/+1
* | | | | Apply default scope when joining associations.Jon Leighton2013-06-283-0/+29
* | | | | Fix testJon Leighton2013-06-281-1/+8
* | | | | Fix rake test_sqlite3_memJon Leighton2013-06-282-11/+7