aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make explicit the default media when calling stylesheet_tag and change the de...Marc-Andre Lafortune2011-11-224-3/+6
* add tests for the case where size is explicitly passed to number_field helperVijay Dev2011-11-041-0/+4
* Merge pull request #3517 from arunagw/test_fix_activerecordJon Leighton2011-11-041-1/+1
|\
| * Fix test as one more has_many addedArun Agrawal2011-11-041-1/+1
|/
* Merge pull request #3516 from cesario/fix_gemspecJon Leighton2011-11-047-7/+7
|\
| * Synchronize the gemspecs since CHANGELOG has been renamed to CHANGELOG.mdFranck Verrot2011-11-047-7/+7
|/
* Convert CHANGELOGs to Markdown format.Jon Leighton2011-11-0414-17147/+17080
* Allow the :class_name option for associations to take a symbol.Jon Leighton2011-11-044-2/+15
* Merge pull request #3514 from waseem/remove_size_attribute_from_number_fieldJosé Valim2011-11-042-2/+4
|\
| * Remove 'size' attribute from number_field form helper fixes #3454Waseem Ahmad2011-11-042-2/+4
* | Merge pull request #1163 from amatsuda/sexier_migration_31Aaron Patterson2011-11-044-13/+36
|\ \ | |/ |/|
| * Tests for new create_table DSLAkira Matsuda2011-05-201-0/+20
| * No "t." for the migration DSL!Akira Matsuda2011-05-203-13/+16
* | Merge pull request #3507 from jmazzi/issue-3503Jeremy Kemper2011-11-032-2/+21
* | Stub find_template so that when handle_render_error is called in ActionView::...Jon Leighton2011-11-031-0/+3
* | Fix #3271.Jon Leighton2011-11-033-1/+14
* | Memoize through associationJon Leighton2011-11-031-8/+11
* | Remove all revelant through records.Jon Leighton2011-11-033-9/+29
* | Fix adding multiple instances of the same record to a has_many :through.Jon Leighton2011-11-033-21/+57
* | Fix #3247.Jon Leighton2011-11-033-2/+13
* | Merge pull request #3494 from sinisterchipmunk/usage-erbJosé Valim2011-11-024-1/+13
|\ \
| * | treat USAGE as an ERB templateColin MacKenzie IV2011-11-024-1/+13
|/ /
* | Revert "Disable 1.9.3 builds until upgraded from -preview1 to -rc1"Jeremy Kemper2011-11-011-1/+1
* | this should never return nil, so no use for "try"Aaron Patterson2011-10-311-1/+1
* | Ensure that the format isn't applied twice to the cache key, else it becomes ...Christopher Meiklejohn2011-10-312-1/+14
* | assert_match takes a regexp and a string in that orderVijay Dev2011-10-311-1/+1
* | Merge pull request #3477 from rud/stable-migrations-version-order-rebasedJosé Valim2011-10-312-1/+10
|\ \
| * | dump_schema_information: explicitly order inserts into schema_migrations tableLaust Rud Jacobsen2011-10-312-1/+10
|/ /
* | Merge pull request #3469 from kennyj/dont_use_old_codeSantiago Pastorino2011-10-301-3/+4
|\ \
| * | Refactor ActiveSupport::Cache::FileStore. used method and deleted duplicate ...kennyj2011-10-301-3/+4
|/ /
* | Merge pull request #3468 from kennyj/fix_a_document_for_compress_limitVijay Dev2011-10-301-1/+1
|\ \
| * | fix a document for :compress_threshold. DEFAULT_COMPRESS_LIMIT is 16K.kennyj2011-10-301-1/+1
|/ /
* | prefer qualified constant "name" to "reference expression", much simplerXavier Noria2011-10-301-2/+2
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-306-7/+10
|\ \
| * | Updated links to authentication plugins.Joost Baaij2011-10-281-1/+1
| * | Fix a little typoHenare Degan2011-10-261-1/+1
| * | Adds missing closing regex slashes.mjy2011-10-251-2/+2
| * | add namespacing when referring to ActionController::RedirectBackErrorNick Howard2011-10-251-2/+2
| * | Added a note that optimistic locking also needs a hidden field to function ac...Joost Baaij2011-10-251-0/+3
| * | note that after_initialize is run for rake tasksBruce Adams2011-10-241-1/+1
* | | fixes a typo (thanks to Alexey Vakhov)Xavier Noria2011-10-301-1/+1
* | | Merge pull request #3464 from kennyj/avoid_to_call_twiceSantiago Pastorino2011-10-291-8/+5
|\ \ \
| * | | avoided to call twicekennyj2011-10-301-8/+5
* | | | defines Module#qualified_const_(defined?|get|set) and String#deconstantizeXavier Noria2011-10-2910-13/+311
* | | | Merge pull request #3463 from kennyj/fix_document_for_cacheSantiago Pastorino2011-10-291-1/+1
|\ \ \ \
| * | | | fix a document for race_condition_ttl. ActiveSupport::Cache::MemoryCache isn'...kennyj2011-10-301-1/+1
* | | | | Removing db/seeds.rb is fine. Don't blow up.Jeremy Kemper2011-10-292-2/+8
| |/ / / |/| | |
* | | | Merge pull request #3462 from kennyj/remove_deprecated_codeJosé Valim2011-10-291-2/+0
|\ \ \ \ | |/ / / |/| | |
| * | | removed reference to SynchronizedMemoryStore and CompressedMemCacheStore (the...kennyj2011-10-301-2/+0
|/ / /
* | | Merge pull request #3337 from htanata/fix_rake_routes_for_controller_only_routeJosé Valim2011-10-292-9/+18
|\ \ \