aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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.md
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reasons: * Markdown reads well as plain text, but can also be formatted. * It will make it easier for people to read on the web as Github formats the Markdown nicely. * It will encourage a level of consistency when people are writing CHANGELOG entries. The script used to perform the conversion is at https://gist.github.com/1339263
* | | Allow the :class_name option for associations to take a symbol.Jon Leighton2011-11-044-2/+15
| | | | | | | | | | | | | | | This is to avoid confusing newbies, and to be consistent with the fact that other options like :foreign_key already allow a symbol or a string.
* | | 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 #3454
| * | | Remove 'size' attribute from number_field form helper fixes #3454Waseem Ahmad2011-11-042-2/+4
| | | | | | | | | | | | | | | | | | | | f.number_field generates <input type="number", size="30"../> which is invalid HTML5. See: http://dev.w3.org/html5/spec/Overview.html#number-state
* | | | Merge pull request #1163 from amatsuda/sexier_migration_31Aaron Patterson2011-11-044-13/+36
|\ \ \ \ | |/ / / |/| | | Sexier migrations
| * | | Tests for new create_table DSLAkira Matsuda2011-05-201-0/+20
| | | |
| * | | No "t." for the migration DSL!Akira Matsuda2011-05-203-13/+16
| | | | | | | | | | | | | | | | | | | | Now you can omit |t| block parameter and all the t. from your migration code, that means, the syntax looks more Rails-3-ish, like the routes DSL and ActionMailer DSL. Also, this change won't break any of your existing migration files, since the traditional syntax is still available.
* | | | Merge pull request #3507 from jmazzi/issue-3503Jeremy Kemper2011-11-032-2/+21
| | | | | | | | | | | | | | | | Preserve SELECT columns on the COUNT for finder_sql when possible
* | | | Stub find_template so that when handle_render_error is called in ↵Jon Leighton2011-11-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | ActionView::Template, we get to see the actual underlying error rather than a NoMethodError. This shows an encoding bug on Ruby 1.9.3.
* | | | Fix #3271.Jon Leighton2011-11-033-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building the conditions of a nested through association could potentially modify the conditions of the through and/or source association. This is a Bad Thing.
* | | | Memoize through associationJon Leighton2011-11-031-8/+11
| | | |
* | | | Remove all revelant through records.Jon Leighton2011-11-033-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a record is removed from a has_many :through, all of the join records relating to that record should also be removed from the through association's target. (Previously the records were removed in the database, but only one was removed from the in-memory target array.)
* | | | Fix adding multiple instances of the same record to a has_many :through.Jon Leighton2011-11-033-21/+57
| | | | | | | | | | | | | | | | Fixes #3425.
* | | | Fix #3247.Jon Leighton2011-11-033-2/+13
| | | | | | | | | | | | | | | | | | | | Fixes creating records in a through association with a polymorphic source type.
* | | | Merge pull request #3494 from sinisterchipmunk/usage-erbJosé Valim2011-11-024-1/+13
|\ \ \ \ | | | | | | | | | | treat USAGE as an ERB template
| * | | | 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 reverts commit 8a6acc17bb8badf70e300f599bf0440ee197028c.
* | | | 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
| | | | | | | | | | | | | | | | impossible to target with expire_action.
* | | | 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
| * | | | dump_schema_information: explicitly order inserts into schema_migrations tableLaust Rud Jacobsen2011-10-312-1/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This change reduces churn in the db/development_structure.sql file when using :sql as active_record.schema_format, and makes comparing diffs much easier. Test ensures the output SQL-statements are lexically ordered by version.
* | | | Merge pull request #3469 from kennyj/dont_use_old_codeSantiago Pastorino2011-10-301-3/+4
|\ \ \ \ | | | | | | | | | | Refactor ActiveSupport::Cache::FileStore.
| * | | | Refactor ActiveSupport::Cache::FileStore. used method and deleted duplicate ↵kennyj2011-10-301-3/+4
|/ / / / | | | | | | | | | | | | code.
* | | | 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.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Removed mention of restful_authentication. Added devise and authlogic. Also mention Rails 3.1 built-in logic.
| * | | 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 ↵Joost Baaij2011-10-251-0/+3
| | | | | | | | | | | | | | | | across web workers.
| * | | 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 `Marshal.dump` twice
| * | | | avoided to call twicekennyj2011-10-301-8/+5
| | | | |
* | | | | defines Module#qualified_const_(defined?|get|set) and String#deconstantizeXavier Noria2011-10-2910-13/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also implements a faster version of #demodulize I was unable to isolate with git add --patch. Not a big fan of the name #deconstantize. It complements #demodulize getting rid of the rightmost constant, hence the name, but it is unrelated to the well-known #constantize. So unsure. Could not come with anything better, please feel free to rename.
* | | | | 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't exist.
| * | | | | fix a document for race_condition_ttl. ActiveSupport::Cache::MemoryCache ↵kennyj2011-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | isn't exist
* | | | | | 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 a reference to SynchronizedMemoryStore and CompressedMemCacheStore
| * | | | removed reference to SynchronizedMemoryStore and CompressedMemCacheStore ↵kennyj2011-10-301-2/+0
|/ / / / | | | | | | | | | | | | (the remaining code from 9cafc28874)
* | | | Merge pull request #3337 from htanata/fix_rake_routes_for_controller_only_routeJosé Valim2011-10-292-9/+18
|\ \ \ \ | | | | | | | | | | Remove trailing "#" on rake routes for controller only routes
| * | | | On inpsect routes, show :controller and :action to indicate dynamic.Hendy Tanata2011-10-292-9/+18
| | | | |
* | | | | Merge pull request #3460 from arunagw/method_redefine_warning_removedXavier Noria2011-10-291-0/+1
|\ \ \ \ \ | | | | | | | | | | | | method redefined warning removed!
| * | | | | method redefined warning removed!Arun Agrawal2011-10-291-0/+1
|/ / / / /