aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Updated 4.0 release notesVijay Dev2012-12-042-818/+49
* | | Merge pull request #8416 from kennyj/redundant_pg_namespaceRafael Mendonça França2012-12-041-1/+0
|\ \ \ | | |/ | |/|
| * | pg_namespace table isn't used.kennyj2012-12-051-1/+0
|/ /
* | Track the default application.css/js files for turbolinks as per version 0.6.0David Heinemeier Hansson2012-12-041-2/+2
* | Fixed issue where routes with globs caused constraints on that glob toMaura Fitzgerald2012-12-043-1/+34
* | Merge pull request #8403 from senny/3313_after_find_is_triggered_too_oftenRafael Mendonça França2012-12-044-2/+26
|\ \
| * | Do not instantiate intermediate AR objects when eager loading.Yves Senn2012-12-044-2/+26
|/ /
* | Bump mailer to quiet the stdout log messagesJeremy Kemper2012-12-031-1/+1
* | Merge pull request #8411 from YasuOza/turbolinks_require_bottomRafael Mendonça França2012-12-031-1/+3
|\ \
| * | Locate `=require turbolinks` at the bottom of application.jsYasuharu Ozaki2012-12-041-1/+3
|/ /
* | Merge pull request #8393 from frodsan/fix_dependend_order_test_exampleCarlos Antonio da Silva2012-12-031-0/+3
|\ \
| * | ensure original encoding doesnt changeFrancesco Rodriguez2012-12-011-0/+3
* | | Use send in Time marshal extensions since the methods are now privateCarlos Antonio da Silva2012-12-031-1/+1
* | | Override <%== to always behave as literal text rather than toggling based on ...Jeremy Kemper2012-12-033-4/+21
* | | Merge pull request #8407 from kennyj/fix_profiler_commentsRafael Mendonça França2012-12-032-3/+3
|\ \ \
| * | | 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