aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5998 from aderyabin/fix7Xavier Noria2012-04-262-24/+25
|\ | | | | EXPLAIN only for sqlite3
| * EXPLAIN only for sqlite3Andrey Deryabin2012-04-262-24/+25
|/
* Merge pull request #5995 from kennyj/fix_5847-3Jon Leighton2012-04-262-0/+27
|\ | | | | Fix #5847 and #4045. Load AR::Base before loading an application model.
| * Fix #5847 and #4045. Load AR::Base before loading an application model.kennyj2012-04-262-0/+27
| |
* | remove deprecate #update_all usageJon Leighton2012-04-264-12/+6
| |
* | fix #scoped deprecationsJon Leighton2012-04-264-15/+16
| |
* | remove deprecated scope stuffJon Leighton2012-04-265-54/+2
| |
* | default_scope with a hash is deprecatedJon Leighton2012-04-261-10/+0
|/
* fix number_to_human docs [ci skip]Vijay Dev2012-04-261-2/+2
|
* Routes reloader knows how to reload external filesYehuda Katz2012-04-253-4/+73
|
* Fix missing Rails.env in route inspect testsYehuda Katz2012-04-251-0/+1
|
* Fix the buildYehuda Katz2012-04-252-2/+3
|
* Make files in paths consistentYehuda Katz2012-04-251-1/+1
|
* Allow loading external route files from the routerJose and Yehuda2012-04-259-3/+79
| | | | | | | | | This feature enables the ability to load an external routes file from the router via: draw :filename External routes files go in +config/routes+. This feature works in both engines and applications.
* remove unused methodJon Leighton2012-04-251-6/+0
|
* remove tests for #with_scope (it's now deprecated)Jon Leighton2012-04-2513-767/+6
|
* Merge pull request #5973 from academia-edu/masterAaron Patterson2012-04-252-3/+10
|\ | | | | Always quote hstore keys and values
| * Restore .to_s to escape_hstoreRyan Fitzgerald2012-04-241-1/+1
| |
| * Always quote hstore keys and valuesRyan Fitzgerald2012-04-242-3/+10
| | | | | | | | | | | | | | escape_hstore uses quotation marks around keys and values only if it seems necessary. However, it currently breaks in the presence of some non-ASCII characters. Instead of trying to guess exactly which characters are safe, it seems better to always use quotes.
* | Merge remote-tracking branch 'jmbejar/define_array_methods_collection_proxy'Jon Leighton2012-04-251-0/+13
|\ \
| * | Define array methods in ActiveRecord::Associations::CollectionProxyJorge Bejar2012-04-181-0/+13
| | | | | | | | | | | | | | | | | | if they are not defined or delegated. In this way, we have a performance boost invoking some array methods which are not defined in CollectionAssociation.
* | | Merge remote-tracking branch 'kennyj/fix_5563'Jon Leighton2012-04-255-4/+17
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/associations/belongs_to_associations_test.rb
| * | | Fix #5563. Should reflect the most recent change to either of association / id.kennyj2012-04-132-1/+13
| | | |
| * | | @stale_state should be nil when a model isn't saved.kennyj2012-04-133-3/+4
| | | |
* | | | add missing testJon Leighton2012-04-251-0/+12
| | | |
* | | | extract #with_scope and #with_exclusive_scope to ↵Jon Leighton2012-04-252-122/+4
| | | | | | | | | | | | | | | | active_record_deprecated_finders
* | | | extract deprecated codeJon Leighton2012-04-253-11/+4
| | | |
* | | | Extract deprecated codeJon Leighton2012-04-252-9/+13
| | | |
* | | | fix interpolation for hash mergingJon Leighton2012-04-253-24/+39
| | | |
* | | | allow merging a single where valueJon Leighton2012-04-252-1/+7
| | | |
* | | | extract to active_record_deprecated_findersJon Leighton2012-04-251-6/+5
| | | |
* | | | giving a hash to default scope should not be deprecated (well, not for this ↵Jon Leighton2012-04-252-3/+3
| | | | | | | | | | | | | | | | reason)
* | | | Remove blank line at the end of routes.rbJeremy Kemper2012-04-251-2/+1
| | | |
* | | | Merge pull request #5902 from avakhov/generator-no-indent-blank-linesJosé Valim2012-04-252-1/+9
|\ \ \ \ | | | | | | | | | | Don't indent blank lines in named base generators
| * | | | Don't indent blank lines in named base generatorsAlexey Vakhov2012-04-252-1/+9
| | | | |
* | | | | Merge pull request #5878 from oscardelben/refactor_observed_classVijay Dev2012-04-251-5/+2
|\ \ \ \ \ | | | | | | | | | | | | Refactor Observer.observed_class
| * | | | | Refactor Observer.observed_classOscar Del Ben2012-04-251-5/+2
| |/ / / /
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-2520-44/+242
|\ \ \ \ \
| * | | | | copy edits [ci skip]Vijay Dev2012-04-252-2/+2
| | | | | |
| * | | | | Revert "Added warning that require_tree includes files in unspecified order. ↵Vijay Dev2012-04-251-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So, that people may know the order of their scripts might be the reason that their scripts work in just fine in development but not in production. " This reverts commit 9dbd511172170f60b96012b7b87044638c3962b8. Reason: Sounds like something for the guide, not the template.
| * | | | | removing changes made in ccd0b511c933d3e2c7f3e345622ad2cc17728de5 and ↵Vijay Dev2012-04-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | 189a1728b561c19404f814979fd73adc5bea554d [ci skip]
| * | | | | Add partials explanation to getting started guideOscar Del Ben2012-04-251-0/+31
| | | | | |
| * | | | | Add screenshot to updating post sectionOscar Del Ben2012-04-252-1/+6
| | | | | |
| * | | | | fix code syntaxOscar Del Ben2012-04-251-2/+2
| | | | | |
| * | | | | Add include documentation to serializationOscar Del Ben2012-04-251-1/+6
| | | | | |
| * | | | | improve serialization docOscar Del Ben2012-04-251-4/+5
| | | | | |
| * | | | | Remove lonely number signAlexey Vakhov2012-04-251-1/+1
| | | | | |
| * | | | | for get -> forgetUģis Ozols2012-04-251-1/+1
| | | | | |
| * | | | | Added notice on how to enable gzip compression. Gaurish Sharma2012-04-251-1/+1
| | | | | | | | | | | | | | | | | | (Fixed typo from previous commit: ccd0b511c933d3e2c7f3e345622ad2cc17728de5)
| * | | | | Added notice on how to enable gzip compression in rails app using ↵Gaurish Sharma2012-04-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Rack::Deflater. it is disabled & commented out by default.