aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Removed deprecated methods partial_updates and familyNeeraj Singh2013-07-023-25/+5
| | | | | Removed deprecated methods `partial_updates`, `partial_updates?` and `partial_updates=`
* Merge pull request #11213 from neerajdotname/scoped-deprecatedRafael Mendonça França2013-07-012-5/+4
|\ | | | | | | | | | | | | Removed deprecated scoped method Conflicts: activerecord/CHANGELOG.md
| * 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 default_scopes?
| * | 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/plugin
| * | | s/plugin_new/pluginschneems2013-06-3035-16/+20
| | | | | | | | | | | | | | | | | | | | There are historical reasons that the `plugin` command was `plugin_new`, now those are no longer applicable, we should remove the naming edge case from the project. This PR is based off of comments from #11176 ATP Railties
* | | | Merge pull request #11207 from vipulnsward/remove_escapesCarlos Antonio da Silva2013-07-011-6/+6
|\ \ \ \ | | | | | | | | | | Remove redundant escapes from xml serialization test
| * | | | 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::Callbacks
| * | | Further clean-up of ActiveSupport::CallbacksGenadi Samokovarov2013-07-011-10/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #11195 I noticed a trailing comma in the docs, but I decided to further clean it up. What I have done: * Clean up the trailing comma in the docs and some extra whitespace lines. * Used `Array#extract` options to factor the repetitive pattern of `args.last.is_a(Hash) ? ...` * Renamed the local var `config` to `options` in `define_callbacks`, as `options` seems to be the de facto name for the options objects. * Renamed the local var `l` to `line` in `define_callback` (maybe it meant `lambda` in the context) as single `l` may look like `1` in some fonts.
* | | Merge pull request #10099 from wangjohn/railties_each_with_config_2nd_attemptSantiago Pastorino2013-07-012-7/+226
|\ \ \ | |/ / |/| | Created way of cloning a Rails::Application instance
| * | Allowing multiple rails applications in the same ruby instance.wangjohn2013-06-302-7/+226
|/ / | | | | | | | | This change provides the ability to create a new application with a configuration which can be specified.
* | Merge pull request #11195 from yangchenyun/update_doc_for_define_callbacksCarlos Antonio da Silva2013-06-301-13/+14
|\ \ | | | | | | updated AS:Callbacks docs, variable namings
| * | unified the param names across all callbacks manipulation methodsSteven Yang2013-07-011-10/+10
| | | | | | | | | | | | | | | | | | | | | _ Rename the define_callbacks params to `names` - in order to match the naming conventions for `get_callbacks` and `set_callbacks` at https://github.com/rails/rails/blob/master/activesupport/lib/active_support/callbacks.rb#L736-743 - `define_callbacks` just register names(events), not define the real callback functions. - Rename the `reset_callbacks` params
| * | updated AS:Callbacks doc for terminator option in define_callbacks methodSteven Yang2013-06-301-3/+4
| | | | | | | | | | | | The change is commited at ba552764344bc0a3c25b8576ec11f127ceaa16da
* | | 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 guides
| * | | 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_find
| * | | 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 additional roflscale
| * | 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::Callbacks
| * | | remove evals from AM::Validations::CallbacksSteven Yang2013-06-301-1/+3
| | |/ | |/| | | | | | | follow the same refactor at a63a964a5d1ed02cf0df1b1a33a96ed2a9fa987b
* | | 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 in Getting Started guide.
| * | | Synchronize PostController#create code from 5.6 to others sections. [ci skip]Paul Nikitochkin2013-06-301-9/+34
| | |/ | |/| | | | | | | Fixed `permit` using for comments.
* | | 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]
| * | | Remove a duplicated section [ci skip]Robin Dupret2013-06-291-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | Attachments were previously covered so remove the useless part. Just move a note about multipart headers set when the mail method is triggered to the kept section.
* | | | Merge pull request #11189 from ↵Yves Senn2013-06-301-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | jetthoughts/destroy_link_description_for_getting_started Added clarification for destroy link_to description in 5.14
| * | | | 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
| * | | 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`
| * Fix `rails plugin --help`schneems2013-06-292-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now if you run the `rails plugin --help` command it fails because rails expects a command in `railties/lib/rails/commands/plugin.rb` that does not exist because the file is named `plugin_new`. This is the error: ``` ruby-2.0.0-p0 ~/documents/projects/tmp/vanilla (master) $ rails plugin --help /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `require': cannot load such file -- rails/commands/plugin (LoadError) from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `block in require' from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:213:in `load_dependency' from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `require' from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/railties-4.0.0/lib/rails/commands.rb:49:in `<top (required)>' from bin/rails:4:in `require' from bin/rails:4:in `<main>' ```
* | Merge pull request #11177 from yangchenyun/mineJosé Valim2013-06-291-8/+8
|\ \ | | | | | | provide a more sementic local variables name in ActiveModel::Validation::Clusivity
| * | provide a more sementicthe local variables name for ↵Steven Yang2013-06-291-8/+8
| | | | | | | | | | | | | | | | | | | | | ActiveModel::Validations::Clusivity#include? method the original name `exclusion` is a bit confusing when using with the method `inclusion_method` rename it to a more logic neutral name.
* | | Merge pull request #11156 from ↵Rafael Mendonça França2013-06-294-2/+23
|\ \ \ | |/ / |/| | | | | | | | JonRowe/fix_tags_picking_string_keys_from_non_stringified_options Fetch value(s) from stringified options in tags that stringify options
| * | 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
| * | | 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' template [ci skip]
| * | 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
| | | | | | | | | | | | | | | | request thread to return up the stack before the instance variable is assigned. Synchronize so that the ivar is assigned before the other thread can activate. fixes #10984
* | Merge pull request #11160 from ↵Vijay Dev2013-06-281-8/+21
|\ \ | | | | | | | | | | | | wangjohn/documentation_for_railties_initialization_guide Adding documentation to the Rails initialization guide.
| * | Adding documentation to the Rails initialization guide. [ci skip]wangjohn2013-06-261-8/+21
|/ /
* | Merge pull request #11163 from ↵Carlos Antonio da Silva2013-06-283-3/+17
|\ \ | | | | | | | | | | | | nfedyashev/omit_turbolinks_on_javascript_skip_option Omit turbolinks configuration completely on skip_javascript generator option
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-31 00:04:20 +0000