aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* oops, no need for puts!Aaron Patterson2011-02-181-1/+0
|
* AR::AttributeMethods does not need to be included in an AR::Base class.Aaron Patterson2011-02-182-1/+67
|
* fixes a merge conflictXavier Noria2011-02-191-10/+0
|
* We really don't care about IM middleware order, the important is that it ↵Emilio Tagua2011-02-181-1/+1
| | | | gets included.
* merges docrailsXavier Noria2011-02-1827-1334/+415
|\
| * removes indent from guides exampleXavier Noria2011-02-181-1/+1
| |
| * Revert "Created a new Troubleshooting section in the migrations guide."Xavier Noria2011-02-181-14/+1
| | | | | | | | | | | | | | | | | | Mismatches between migrations and constants have nothing to do with pluralization rules or model names. The mismatch happens between the camelization of the filename minus timestamp, and the name of the migration class itself. This reverts commit 1c21f75f1b32ee8723c74a9bc7af70dfa02a509c.
| * removes unrealistic example (authentication plus gender?), that it is not ↵Xavier Noria2011-02-181-4/+1
| | | | | | | | needed anyway
| * Clarify Example in ActiveRecord baseNicholas Rowe2011-02-181-1/+1
| |
| * Remove awkward phrasing from Ajax on Rails guideNicholas Rowe2011-02-171-1/+1
| |
| * Fix Typos: remove several occurences of the theNicholas Rowe2011-02-175-5/+5
| |
| * fix type: remove extra periodNicholas Rowe2011-02-171-1/+1
| |
| * Created a new Troubleshooting section in the migrations guide.Kedar Mhaswade2011-02-171-1/+14
| | | | | | | | | | Added a bullet point there showing how the Uninitialized Constant (missing migration class) error looks like.
| * commas to set off expressions that interrupt sentence flowgenlinux2011-02-171-3/+3
| |
| * Add description of transaction callbacks to ActiveRecord callbacks guide.Brian Durand2011-02-171-0/+35
| |
| * update caching guide with the changes to ActiveSupport::Cache from the 3.0.0 ↵Brian Durand2011-02-171-42/+52
| | | | | | | | release.
| * fix typoVijay Dev2011-02-171-1/+1
| |
| * 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
| | |