aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't eager load all thisSantiago Pastorino2012-08-031-32/+33
| | | | | Some are loaded from Base which is loaded when a model inherits from it and some others are used in rake tasks
* Remove ActiveRecord::Base.to_aJon Leighton2012-08-0318-64/+55
| | | | | On reflection, it seems like a bit of a weird method to have on ActiveRecord::Base, and it shouldn't be needed most of the time anyway.
* reinstate changelog that seems to have been accidentally deleted o_OJon Leighton2012-08-031-0/+19
|
* Allow Relation#merge to take a proc.Jon Leighton2012-08-033-2/+37
| | | | | | | | | | | | | | | | | | This was requested by DHH to allow creating of one's own custom association macros. For example: module Commentable def has_many_comments(extra) has_many :comments, -> { where(:foo).merge(extra) } end end class Post < ActiveRecord::Base extend Commentable has_many_comments -> { where(:bar) } end
* make sure the body finishes rendering before checking response closureAaron Patterson2012-08-031-1/+2
|
* Merge pull request #7231 from armanddp/no_contentRafael Mendonça França2012-08-023-8/+38
|\ | | | | Remove single character body in head(:no_content) response
| * Collapsed dual checks (one for content headers and one for content) into a ↵Armand du Plessis2012-08-023-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | single check. Rails includes a single character body to a head(:no_content) response to work around an old Safari bug where headers were ignored if no body sent. This patch brings the behavior slightly closer to spec if :no_content/204 is explicity requested via a head only response. Status comparison done on symbolic and numeric values Not returning any content when responding with head and limited to a status code that explicitly states no content will be returned - 100..199, 204, 205, 304.
* | Remove `:rails_env` task since it is not needed anymore.Rafael Mendonça França2012-08-022-16/+9
|/
* Merge pull request #7240 from steveklabnik/fix_2301Rafael Mendonça França2012-08-023-4/+7
|\ | | | | Fix for digest authentication bug - issue #2301 in rails/rails
| * Changelog entry for Digest Auth fix (#2301)Steve Klabnik2012-08-021-0/+2
| |
| * Fix for digest authentication bug - issue #2301 in rails/railsArthur Smith2012-08-022-4/+5
| |
* | load active_support/deprecation in active_support/railsXavier Noria2012-08-0220-19/+4
| |
* | load active_support/core_ext/module/delegation in active_support/railsXavier Noria2012-08-0217-16/+3
| |
* | load active_support/core_ext/class/attribute in active_support/railsXavier Noria2012-08-0232-34/+6
| |
* | load active_support/concern in active_support/railsXavier Noria2012-08-0217-16/+3
| |
* | load active_support/dependencies/autoload in active_support/railsXavier Noria2012-08-023-2/+3
| |
* | load active_support/core_ext/object/inclusion in active_support/railsXavier Noria2012-08-0226-25/+4
| |
* | load active_support/core_ext/object/blank in active_support/railsXavier Noria2012-08-0255-54/+2
| |
* | defines a private require-hub active_support/railsXavier Noria2012-08-028-0/+16
| | | | | | | | | | | | | | | | This is a private place to put those AS features that are used by every component. Nowadays we cherry-pick individual files wherever they are used, but that it is not worth the effort for stuff that is going to be loaded for sure sooner or later, like blank?, autoload, concern, etc.
* | Check validity of options[:as] just onceJosé Valim2012-08-021-12/+18
| |
* | Merge pull request #7129 from kennyj/fix_7079José Valim2012-08-022-7/+19
|\ \ | |/ |/| Improve error handling when using partial name with hyphen. #7079
| * Improve error handling when using partial name with hyphen. Fix #7079kennyj2012-08-032-7/+19
| |
* | Fix tests.Rafael Mendonça França2012-08-021-2/+2
| | | | | | | | | | Since b6ab4417720e03f1551abda2f1e4bd0a392dd04e the single quotes are being escaped in the templates.
* | Do not consider the numeric attribute as changed if the old value isRafael Mendonça França2012-08-022-2/+15
|/ | | | | | | | | | | | | | | | | | | | | | | zero and the new value is not a string. Before this commit this was the behavior r = Review.find_by_issue(0) r.issue => 0 r.changes => {} r.issue = 0 => 0 r.changed? => true r.changes => {"issue"=>[0,0]} Fixes #7237 Conflicts: activerecord/CHANGELOG.md
* s/scoped/scope/Jon Leighton2012-08-019-27/+33
|
* Add CollectionProxy#scopeJon Leighton2012-08-013-1/+30
| | | | | | | | | | | | | | | | This can be used to get a Relation from an association. Previously we had a #scoped method, but we're deprecating that for AR::Base, so it doesn't make sense to have it here. This was requested by DHH, to facilitate code like this: Project.scope.order('created_at DESC').page(current_page).tagged_with(@tag).limit(5).scoping do @topics = @project.topics.scope @todolists = @project.todolists.scope @attachments = @project.attachments.scope @documents = @project.documents.scope end
* Use explicit delegationsJon Leighton2012-08-011-119/+79
| | | | | | | This makes it easier to see what the documentation refers to. It also means that we are not doing unnecessary work for delegations that have no args / splats / block / etc.
* Refactor a bitJon Leighton2012-08-011-38/+37
| | | | | This doesn't change the exernal behavior, but it moves some code around to where I think it properly belongs.
* Add `Relation#load`Jon Leighton2012-08-013-2/+35
| | | | | | | | | | | | | This method explicitly loads the records and then returns `self`. Rather than deciding between "do I want an array or a relation?", most people are actually asking themselves "do I want to eager load or lazy load?" Therefore, this method provides a way to explicitly eager-load without having to switch from a `Relation` to an array. Example: @posts = Post.where(published: true).load
* Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.Jon Leighton2012-08-019-45/+118
|
* Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."Jon Leighton2012-08-0115-84/+339
| | | | | | | | | This reverts commit 3803fcce26b837c0117f7d278b83c366dc4ed370. Conflicts: activerecord/CHANGELOG.md It will be deprecated only in 4.0, and removed properly in 4.1.
* Merge pull request #7217 from ↵Carlos Antonio da Silva2012-08-013-2/+21
|\ | | | | | | | | freerobby/no_password_requirement_if_validations_skipped has_secure_password should not raise a 'digest missing' error if the calling class has specified for validations to be skipped.
| * has_secure_password should not raise a 'digest missing' error if the calling ↵Robby Grossman2012-07-313-2/+21
| | | | | | | | class has specified for validations to be skipped.
* | Merge pull request #7228 from kennyj/move_to_ar2Carlos Antonio da Silva2012-08-011-1/+1
|\ \ | | | | | | | | | | | | Change AR's CHANGELOG, because it is related to e35c67ae0f920011a2440210041e96659a8de985 [ci skip]
| * | Change AR's CHANGELOG, because it is related to ↵kennyj2012-08-021-1/+1
|/ / | | | | | | e35c67ae0f920011a2440210041e96659a8de985
* | Merge pull request #7224 from kennyj/move_to_arJosé Valim2012-08-012-17/+22
|\ \ | | | | | | The use_schema_cache_dump configuration moved to ActiveRecord.
| * | The use_schema_cache_dump configuration moved to ActiveRecord.kennyj2012-08-022-17/+22
| | |
* | | Merge branch 'refactor-dependency-check'Carlos Antonio da Silva2012-08-014-21/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Extract dependency check logic that raises ArgumentError in case of an invalid :dependent option given to an association. Closes #7054
| * | | Refactor dependency check validationCarlos Antonio da Silva2012-08-014-28/+19
| | | | | | | | | | | | | | | | | | | | | | | | Move the logic for validation check to the same method, and cache dependent option in a variable to reuse inside the dependency configuration methods instead of relying on the options hash.
| * | | move method for dependent option checkHrvoje Šimić2012-08-014-11/+22
| | |/ | |/|
* | | Merge pull request #7219 from jmazzi/masterRafael Mendonça França2012-08-011-0/+11
|\ \ \ | | |/ | |/| Restoring documentation for env_config
| * | Restoring documentation for env_config per #7070Justin Mazzi2012-08-011-0/+11
|/ /
* | Merge pull request #7147 from pferdefleisch/scaffold_controller_docsRafael Mendonça França2012-07-311-4/+3
|\ \ | | | | | | | | | Updated scaffold_controller generator docs #7146
| * | Updated scaffold_controller generator docs #7146Aaron Cruz2012-07-311-4/+3
|/ / | | | | | | | | | | | | | | | | | | It was just a copy of the controller generator documentation which was misleading. It doesn't accept arguments for views. This seems more descriptive as well. Respect 80 char limit. #7147 Made a nicer paragraph #7147
* | Merge pull request #7204 from frodsan/update_conventionsRafael Mendonça França2012-07-311-8/+8
|\ \ | | | | | | Follow code conventions in metal/live
| * | update coding conventions in metal/liveFrancesco Rodriguez2012-07-301-8/+8
| | |
* | | html_escape should escape single quotesSantiago Pastorino2012-07-3110-30/+30
| |/ |/| | | | | | | https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content Closes #7215
* | Merge pull request #7212 from accessd/small-typo-fixRafael Mendonça França2012-07-311-1/+1
|\ \ | | | | | | small fix typo in collection proxy
| * | fix typo in collection proxyAccessd2012-07-311-1/+1
|/ /
* | Update activesupport/CHANGELOG.mdJosé Valim2012-07-311-0/+2
| |