aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | ActiveRecord find_in_batches should work without logger When I set logger to nil both methods from Batches module find_in_batches or find_each should work anyway.
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 94924dc32baf78f13e289172534c2e71c9c8cade the internal default_scope implementation has changed making it simpler to follow, meaning that the old usage of with_default_scope has been removed. With that, order_values was the same argument for both calls to find_first_with_limit, so remove it and use the existent attribute for the sake of clarity/simplification.
* | | | Simplify/fix implementation of default scopesJon Leighton2013-06-2812-74/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation was necessary in order to support stuff like: class Post < ActiveRecord::Base default_scope where(published: true) scope :ordered, order("created_at") end If we didn't evaluate the default scope at the last possible moment before sending the SQL to the database, it would become impossible to do: Post.unscoped.ordered This is because the default scope would already be bound up in the "ordered" scope, and therefore wouldn't be removed by the "Post.unscoped" part. In 4.0, we have deprecated all "eager" forms of scopes. So now you must write: class Post < ActiveRecord::Base default_scope { where(published: true) } scope :ordered, -> { order("created_at") } end This prevents the default scope getting bound up inside the "ordered" scope, which means we can now have a simpler/better/more natural implementation of default scoping. A knock on effect is that some things that didn't work properly now do. For example it was previously impossible to use #except to remove a part of the default scope, since the default scope was evaluated after the call to #except.
* | | | Merge pull request #11104 from drewda/patch-1Carlos Antonio da Silva2013-06-281-0/+2
|\ \ \ \ | | | | | | | | | | Adding additional plugins to debugging guide [ci skip]
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Thanks @lintzchiang. [ci skip]
* | | | | Apply default scope when joining associations.Jon Leighton2013-06-283-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example: class Post < ActiveRecord::Base default_scope -> { where published: true } end class Comment belongs_to :post end When calling `Comment.join(:post)`, we expect to receive only comments on published posts, since that is the default scope for posts. Before this change, the default scope from `Post` was not applied, so we'd get comments on unpublished posts.
* | | | | Fix testJon Leighton2013-06-281-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Oops. We need to estalish/remove the connection in the setup/teardown, else it messes with the fixtures.
* | | | | Fix rake test_sqlite3_memJon Leighton2013-06-282-11/+7
| | | | | | | | | | | | | | | | | | | | Clearly nobody uses this except me. It's fast people!
* | | | | Merge pull request #11153 from strzalek/remove-ar-deprecated-findersJon Leighton2013-06-287-637/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | Remove depreacted finders
| * | | | Remove depreacted findersŁukasz Strzałkowski2013-06-287-637/+7
| | | | | | | | | | | | | | | | | | | | They were deprecated in 4.0, planned to remove in 4.1
* | | | | Fix indentationAkira Matsuda2013-06-281-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #11150 from ↵Carlos Antonio da Silva2013-06-272-19/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | jetthoughts/remove_depr_message_for_attribute_method_matcher Remove deprecation warning from AttributeMethodsMatcher
| * | | | Remove deprecation warning from AttributeMethodsMatcherPaul Nikitochkin2013-06-282-19/+0
|/ / / /
* | | | Merge pull request #11127 from jetthoughts/ask_user_add_line_to_routes_in_guideYves Senn2013-06-271-2/+2
|\ \ \ \ | | | | | | | | | | Asking user to declare post resource in getting start guide
| * | | | Asking user to declare post resource in guide [ci skip]Paul Nikitochkin2013-06-271-2/+2
|/ / / /