aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * fix typoVijay Dev2011-02-171-1/+1
| |
| * add note about observer config for rails appsJimmy Cuadra2011-02-161-0/+4
| | | | | | | | | | | | | | | | ActiveModel::Observer and ActiveRecord::Observer have similar documentation, but a Rails user looking at the ActiveModel version might not realize that a change to config/application.rb is required to activate the observer. This change adds a note to that effect, pointing to the AR version from the AM version.
| * Revert "Fix error: docrails is a fork, not a branch."Xavier Noria2011-02-151-1/+1
| | | | | | | | | | | | Reason: Calling docrails a "branch" is fine, no need to change the terminology. It is a remote in my machine, and it has been called branch since the very beginning: http://weblog.rubyonrails.org/2008/5/2/help-improve-rails-documentation-on-git-branch This reverts commit 35a266edfd9ac0f3afe7f7f13c2dcf29cb4b651f.
| * Added RDoc info for accepted options for simple_format in TextHelper.Steve Schwartz2011-02-151-0/+7
| |
| * Fix error: docrails is a fork, not a branch.Ben Orenstein2011-02-151-1/+1
| |
| * Correct bad wording in description.Ben Orenstein2011-02-141-1/+1
| |
| * Added --sandbox option to rails console explanation.Dan Neumann2011-02-131-1/+3
| |
| * Added simple demonstration of has_many :throughDan Neumann2011-02-131-0/+6
| |
| * change plugins guide to favor gem based plugins, clean up to reflect the ↵Mike Gehard2011-02-131-1249/+200
| | | | | | | | state of Rails3 plugins, remove information not compatible with Rails3.
| * the shell prompt for non-root sessions is "$" by conventionXavier Noria2011-02-131-1/+1
| |
| * Revert "Add note about running `bundle install` as root. Solves issue with ↵Xavier Noria2011-02-131-1/+0
| | | | | | | | | | | | | | | | '#' not being rendered, and it's more clear for beginners." Reason: Running bundle as root is not recommended. This reverts commit 0d40e2c397c9ce92c839a3c318ed8757cf213413.
| * Add note about running `bundle install` as root. Solves issue with '#' not ↵Corey Ward2011-02-121-0/+1
| | | | | | | | being rendered, and it's more clear for beginners.
| * Change fenomenal to phenomenal.jonnii2011-02-101-1/+1
| |
| * updated reference to remote_form_forVijay Dev2011-02-111-2/+2
| |
| * fix typos, minor editsVijay Dev2011-02-101-5/+5
| |
| * add some docs for ActionController::RenderersGabriel Horner2011-02-101-0/+37
| |
| * replaced MODEL.human_name with MODEL.model_name.human now that .human_name ↵John Paul Ashenfelter2011-02-091-5/+5
| | | | | | | | is deprecated
| * minor fixes in generatorsVijay Dev2011-02-091-10/+12
| |
| * Add note that validates_length_of will incorrectly pluralize min. length 1Kevin Skoglund2011-02-071-0/+2
| |
| * ActiveRecord :default_timezone is :utc in Rails, as set by ↵Paul Annesley2011-02-061-1/+1
| | | | | | | | active_record/railtie.rb
| * fix minor typoVijay Dev2011-02-071-1/+1
| |
| * Add CSS fix for WebKit/Mac rendering issue.Henry Phan2011-02-052-0/+18
| |
* | Change validates inclusion to use cover? for Ranges in ruby 1.9 [#6453 ↵Frederick Cheung2011-02-182-3/+29
| | | | | | | | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com>
* | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-182-9/+1
|\ \
| * | Remove test which was broken on 1.8. This test is now irrelevant since ↵Jon Leighton2011-02-181-8/+0
| | | | | | | | | | | | singular associations no longer return a proxy object.
| * | just use the list of column names to generate attribute methodsAaron Patterson2011-02-181-1/+1
| | |
* | | Don't use skip, just don't run anything, we don't have skip in Ruby 1.8Emilio Tagua2011-02-182-8/+4
| | |
* | | Remove nbproject form gitignore. This shouldn't be here in the first place.Emilio Tagua2011-02-181-1/+0
| | |
* | | WeakHash is not used, remove it.Emilio Tagua2011-02-182-74/+0
| | |
* | | No need to have reinit_with inside an InstanceMethods module.Emilio Tagua2011-02-181-17/+15
| | |
* | | Initialize @target instead asking if it is defined.Emilio Tagua2011-02-181-1/+2
| | |
* | | Should use "=" instead "replace" after this commit: ↵Emilio Tagua2011-02-181-1/+1
| | | | | | | | | | | | 1644663ba7f678d178deab2bf1629dc05626f85b
* | | No need to test agaisnt target.Emilio Tagua2011-02-181-1/+1
| | |
* | | Reindent and remove wrong line left in merge by mistake.Emilio Tagua2011-02-181-4/+3
| | |
* | | Use to_a instead :load in test, since :load changed.Emilio Tagua2011-02-181-1/+1
| | |
* | | No need to test against target anymore.Emilio Tagua2011-02-181-8/+8
| | |
* | | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1847-791/+865
|\| | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb
| * | Split AssociationProxy into an Association class (and subclasses) which ↵Jon Leighton2011-02-1826-502/+392
| | | | | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more.
| * | Add :nodoc: to ThroughAssociation and HasOneAssociationJon Leighton2011-02-182-2/+2
| | |
| * | Allow building and then later saving has_many :through records, such that ↵Jon Leighton2011-02-187-12/+124
| | | | | | | | | | | | the join record is automatically saved too. This requires the :inverse_of option to be set on the source association in the join model. See the CHANGELOG for details. [#4329 state:resolved]
| * | Ensure that association_ids uses the correct attribute where the association ↵Jon Leighton2011-02-184-2/+20
| | | | | | | | | | | | is a has_many :through with a :primary_key option on the source reflection. [#6376 state:resolved]
| * | Remove unused line in test setup.Ben Orenstein2011-02-171-1/+0
| | | | | | | | | | | | | | | | | | [#6442 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | explicitly allowing lolqueriesAaron Patterson2011-02-162-13/+11
| | |
| * | use the arel table rather than generating stringsAaron Patterson2011-02-161-1/+1
| | |
| * | no need for Array.wrapAaron Patterson2011-02-161-1/+1
| | |
| * | fixing whitespace problemsAaron Patterson2011-02-161-3/+3
| | |
| * | removed an unnecessary second query when passing an ActiveRecord::Relation ↵Steven Fenigstein2011-02-162-2/+32
| | | | | | | | | | | | to a where clause. And added ability to use subselects in where clauses.
| * | Fixed issue #6363, avoid to pluralized already pluralized names and ↵Timothy N. Tsvetkov2011-02-162-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | singularize a single in generators, for example stadia is a valid plural for stadium. But calling pluralize for stadia will return stadias which sematically is not corrent in this case [#6363 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | handle double pluralization for irregular pluralsDan Pickett2011-02-163-0/+12
| | | | | | | | | | | | | | | | | | [#6363] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Remove unused code.Ben Orenstein2011-02-161-3/+0
| | | | | | | | | | | | | | | | | | [#6437 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>