aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make conditional_layout? private and update documentationAndrew White2012-12-171-15/+23
* Merge pull request #8539 from frodsan/fix_as_basic_objectCarlos Antonio da Silva2012-12-171-2/+1
|\
| * fix AS::BasicObject :nodoc: [ci skip]Francesco Rodriguez2012-12-171-2/+1
|/
* Merge pull request #8532 from ptn/add_missing_requireXavier Noria2012-12-161-0/+3
|\
| * Add missing requires to core_ext/integer/timePablo Torres2012-12-161-0/+3
|/
* Merge pull request #8529 from schneems/schneems/debug-exceptions-extend-pathSteve Klabnik2012-12-161-1/+1
|\
| * DebugExceptions `File.join` => `File.expand_path`schneems2012-12-161-1/+1
* | Restored 'Working with Validation Errors'Steve Klabnik2012-12-161-0/+140
* | Merge pull request #8518 from rwz/inheritable-basic-objectJeremy Kemper2012-12-152-2/+19
|\ \
| * | AS::BasicObject can be inherited fromPavel Pravosud2012-12-152-2/+19
* | | Add `ActiveModel::Validations::AbsenceValidator`, a validator to check the a...Roberto Vasquez Angel2012-12-155-0/+131
* | | Merge pull request #8519 from rubys/masterRafael Mendonça França2012-12-151-2/+2
|\ \ \
| * | | Remove blank lines from generated GemfileSam Ruby2012-12-151-2/+2
|/ / /
* | | make an editing pass through the upgrading guide [ci skip]Vijay Dev2012-12-151-30/+16
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-1515-189/+435
|\ \ \ | |/ / |/| |
| * | copy editing [ci skip]Vijay Dev2012-12-153-3/+3
| * | bullets have fullstops too [ci skip]Vijay Dev2012-12-151-4/+4
| * | Revert "Add quotes to Numeric Passwords to force string(sqlserver)"Vijay Dev2012-12-151-2/+0
| * | Revert "Add quotes to Numeric Passwords to force string(jdbcmysql)"Vijay Dev2012-12-151-2/+0
| * | Revert "Add quotes to Numeric Passwords to force string(jdbcpostgresql)"Vijay Dev2012-12-151-2/+0
| * | Revert "Add quotes to Numeric Passwords to force string(MySql)"Vijay Dev2012-12-151-2/+0
| * | Revert "Add quotes to Numeric Passwords to force string(Postgres)"Vijay Dev2012-12-151-2/+0
| * | Change method is default since rails 3.1 [ci skip]Gaurish Sharma2012-12-141-8/+1
| * | Elaborate using `inverse_of` with presence validationJay Hayes2012-12-131-1/+2
| * | Fix associations presence lost in steve's reformatJay Hayes2012-12-131-2/+2
| * | Add a small note about the compressing the file, and how that helps the appli...Anuj Dutta2012-12-131-1/+2
| * | Trimming the in resource listing; Tutorial book moved [ci skip]Soon Van2012-12-131-4/+4
| * | Add #destroy! as a method that triggers callbacksPablo Torres2012-12-121-0/+1
| * | Remove deprecated Time methods from the guides [ci skip]Pablo Torres2012-12-111-22/+2
| * | Update guides/source/routing.mdGeorge Claghorn2012-12-111-1/+1
| * | Update railties/lib/rails/info_controller.rbRichard Schneeman2012-12-101-1/+1
| * | remove attr_protected reference from AS Core Extensions guide [ci skip]Francesco Rodriguez2012-12-101-7/+0
| * | remove Mass Assignment reference from Form Helpers guide [ci skip]Francesco Rodriguez2012-12-101-1/+1
| * | remove Mass Assignment reference from Security Guide [ci skip]Francesco Rodriguez2012-12-101-1/+0
| * | Document adding member route without the optionFlorent Guilleux2012-12-101-1/+3
| * | Add multipart: true to form for file upload.Steve Klabnik2012-12-101-1/+1
| * | `config.action_mailer.async` is no longer usedAndy Lindeman2012-12-101-1/+0
| * | repeating documentation for form helpersThiago Pinto2012-12-091-18/+406
| * | Add quotes to Numeric Passwords to force string(sqlserver)Gaurish Sharma2012-12-101-0/+2
| * | Add quotes to Numeric Passwords to force string(jdbcmysql)Gaurish Sharma2012-12-101-0/+2
| * | Add quotes to Numeric Passwords to force string(jdbcpostgresql)Gaurish Sharma2012-12-101-0/+2
| * | Add quotes to Numeric Passwords to force string(MySql)Gaurish Sharma2012-12-101-0/+2
| * | Add quotes to Numeric Passwords to force string(Postgres)Gaurish Sharma2012-12-101-0/+2
| * | Globalize2 is only compatible with Rails 2 so link to Globalize3 insteadHenare Degan2012-12-091-1/+1
| * | use default_options= instead of default to avoid confusionFrancesco Rodriguez2012-12-091-1/+1
| * | Security Guide: removing Mass Assignment.Steve Klabnik2012-12-081-135/+0
* | | Remove unicode character encoding from ActiveSupport::JSON.encodeBrett Carter2012-12-143-10/+23
* | | Skip binary data with binds test for mysql2, fix buildCarlos Antonio da Silva2012-12-142-1/+3
* | | Convert changelogs to 1.9 hash style and fix some formatting [ci skip]Carlos Antonio da Silva2012-12-146-44/+45
* | | Merge pull request #8514 from mmb/filter_blobAaron Patterson2012-12-143-1/+23
|\ \ \