aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix wrong doc and message about rails profiler.kennyj2012-12-042-3/+3
* Try to get back the campfire notificationsRafael Mendonça França2012-12-031-1/+1
* Fix failing tests related to rake notesCarlos Antonio da Silva2012-12-031-2/+2
* Merge pull request #8375 from steveklabnik/migrations_guideXavier Noria2012-12-031-365/+217
|\
| * Migration Guide: General fix-upSteve Klabnik2012-12-011-365/+217
* | Merge pull request #8402 from senny/8376_descriptive_error_message_for_partia...Rafael Mendonça França2012-12-023-1/+16
|\ \
| * | More descriptive error when rendering a partial with `:layout => true`Yves Senn2012-12-023-1/+16
|/ /
* | Merge pull request #8394 from acangiano/add_db_folder_to_annotationsRafael Mendonça França2012-12-013-1/+7
|\ \
| * | Add db to the list of default annotation foldersAntonio Cangiano2012-12-013-1/+7
* | | Merge pull request #8398 from rmascarenhas/active-model-errors-spec-fixesRafael Mendonça França2012-12-011-3/+2
|\ \ \
| * | | Actually test that ActiveModel::Errors#add defaults to :invalid.Renato Mascarenhas2012-12-011-1/+1
| * | | Call `full_messages` instead of `to_a` in its spec.Renato Mascarenhas2012-12-011-2/+1
|/ / /
* | | Merge pull request #8397 from mmb/gitignore_global_homeRafael Mendonça França2012-12-011-1/+1
|\ \ \
| * | | Quote ~ in git config global excludes command.Matthew M. Boedicker2012-12-011-1/+1
|/ / /
* / / Only take the date parts from Time.zone.nowAndrew White2012-12-012-3/+10
|/ /
* | Merge pull request #8382 from asanghi/mailerguideVijay Dev2012-12-011-1/+52
|\ \
| * | Add Mailer Callback section to Mailer guidesAditya Sanghi2012-12-021-1/+52
* | | Remove not used variable warnignsCarlos Antonio da Silva2012-12-012-5/+5
|/ /
* | Merge pull request #8391 from rmascarenhas/reset-attribute-doesnt-change-itRafael Mendonça França2012-12-013-3/+9
|\ \ | |/ |/|
| * Reset attributes should not report changes.Renato Mascarenhas2012-12-013-3/+9
* | Merge pull request #8379 from steveklabnik/validations_guideVijay Dev2012-12-014-347/+342
|\ \ | |/ |/|
| * Here's a few updates to the validations guide. A bunch of small changes,Steve Klabnik2012-12-014-347/+342
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-0140-261/+299
|\
| * copy edits [ci skip]Vijay Dev2012-12-012-2/+2
| * Fix Calculations#pluck doc to mention several attributes can be selected [ci ...Florent Guilleux2012-12-011-3/+3
| * Normalize on 'After reading this guide, you will know:'Steve Klabnik2012-11-2937-28/+80
| * nodoc AS::Deprecation::InstanceDelegator class [ci skip]Francesco Rodriguez2012-11-291-3/+3
| * add documentation to CollectionProxy #length and #size methods [ci skip]Francesco Rodriguez2012-11-291-2/+7
| * add documentation to CollectionProxy#empty?Francesco Rodriguez2012-11-291-1/+6
| * Asset Pipeline: add 'the'Steve Klabnik2012-11-291-2/+2
| * Command Line: remove 'A Guide to'Steve Klabnik2012-11-291-2/+2
| * Migrations: add 'Active Record' to titleSteve Klabnik2012-11-291-2/+2
| * Fix title of 'form helpers' guide.Steve Klabnik2012-11-291-2/+2
| * Associations: s/A Guide//Steve Klabnik2012-11-291-2/+2
| * Remove 'This guide is based on ' warnings.Steve Klabnik2012-11-294-9/+0
| * Add periods to the bullet points in guides.Steve Klabnik2012-11-2928-126/+126
| * Migrations: Fix opening bullets.Steve Klabnik2012-11-291-2/+2
| * ActionView -> Action ViewSteve Klabnik2012-11-291-2/+2
| * ActionController -> Action ControllerSteve Klabnik2012-11-291-2/+2
| * ActiveSupport -> Active SupportSteve Klabnik2012-11-291-4/+4
| * ActionMailer -> Action Mailer.Steve Klabnik2012-11-291-2/+2
| * ActionPack -> Action Pack.Steve Klabnik2012-11-291-1/+1
| * ActiveRecord -> Active RecordSteve Klabnik2012-11-295-6/+6
| * Migrations: move massive paragraph out of intro.Steve Klabnik2012-11-291-10/+19
| * Getting Started: Improve instructions on opening a terminalSteve Klabnik2012-11-291-1/+4
| * Getting Started: remove reference to attr_accessibleSteve Klabnik2012-11-291-11/+0
| * Getting Started: mac -> Mac OS XSteve Klabnik2012-11-291-1/+1
| * Getting Started: Rails 3.2 -> Rails 4.Steve Klabnik2012-11-291-1/+1
| * Revert "correct css selector for the display of validation error messages: ch...Xavier Noria2012-11-281-4/+4
| * Clarifies the cookie store docs a bit and uses correct Markdown syntax for pr...Andy Lindeman2012-11-271-1/+1