aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* 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
| * removes unrealistic example (authentication plus gender?), that it is not nee...Xavier Noria2011-02-181-4/+1
| * 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
| * 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
| * 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
| * Revert "Fix error: docrails is a fork, not a branch."Xavier Noria2011-02-151-1/+1
| * 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 stat...Mike Gehard2011-02-131-1249/+200
| * 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
| * Add note about running `bundle install` as root. Solves issue with '#' not be...Corey Ward2011-02-121-0/+1
| * 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 is...John Paul Ashenfelter2011-02-091-5/+5
| * 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 active_record/rail...Paul Annesley2011-02-061-1/+1
| * 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 state:...Frederick Cheung2011-02-182-3/+29
* | 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 singul...Jon Leighton2011-02-181-8/+0
| * | 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: 1644663ba7f678d178deab2bf...Emilio Tagua2011-02-181-1/+1
* | | 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
|\| |