aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Docs cosmetic fixes in Action View form_helper.rbAlexey Vakhov2011-11-061-2/+2
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-0511-37/+45
|\
| * Revert "outline two ways to invoke a custom active model validator"Vijay Dev2011-11-051-9/+1
| | | | | | | | | | | | | | This reverts commit d163d3bf7ebb98d90977974aed8f85b7ec678afd. Reason: The alternate approach can be documented in the guide and not disrupt the existing flow in the readme.
| * Revert "make the inline text a comment in the code block"Vijay Dev2011-11-052-3/+1
| | | | | | | | | | | | | | This reverts commit 36a5f48f9323c4a770c290a9a16ae58388e7925f. Reason: Editing .gitignore in docrails is not allowed. Docrails is meant only for documentation.
| * Fixed after_initialize/after_find guideFlorian Walch2011-11-051-3/+3
| | | | | | | | | | Defining after_initialize and after_find as ordinary methods like documented in the guide doesn't work with Rails 3.1.1; now macro-style is used here, too.
| * make the inline text a comment in the code blockKarthik Muthupalaniappan2011-11-042-1/+3
| |
| * outline two ways to invoke a custom active model validatorKarthik Muthupalaniappan2011-11-041-1/+9
| |
| * Added bundle exec to rake test.Henrik Hodne2011-11-031-6/+6
| | | | | | | | This is in response to rails/rails#3504.
| * Fix javascript_include_tag examples in documentationAlexey Vakhov2011-11-031-2/+2
| |
| * Fix small typos in routing docsAlexey Vakhov2011-11-031-1/+3
| |
| * minor editVijay Dev2011-11-021-1/+1
| |
| * minor edits in AR validations guideVijay Dev2011-11-021-10/+2
| |
| * use relative urls for linking to sections in the guidesVijay Dev2011-11-021-10/+10
| |
| * Fix wrong link in initialization docjuandebravo2011-11-011-1/+1
| |
| * Fix typo in Dispatcher#controller documentationAviv Ben-Yosef2011-11-011-1/+1
| |
| * Fix typo in constraints method documentationAlexey Vakhov2011-11-011-1/+1
| |
| * [config guide] mention that config methods are to be called on Railtie ↵Ryan Bigg2011-11-011-0/+2
| | | | | | | | subclasses
| * [engines guide] add 'General engine configuration' sectionRyan Bigg2011-11-011-0/+12
| |
| * Update routing guides, root route should be at the top of the fileAlexey Vakhov2011-10-311-1/+1
| |
| * Fix typo on the performance test guideGonçalo Silva2011-10-301-1/+1
| |
* | Merge pull request #3529 from vjebelev/ar_ordered_indexes2Jon Leighton2011-11-0511-20/+111
|\ \ | | | | | | AR changes to support creating ordered (asc, desc) indexes
| * | AR changes to support creating ordered (asc, desc) indexesVlad Jebelev2011-11-0411-20/+111
|/ /
* | 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 added
| * | 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.