aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Upgrade sqlite3 version to 1.3.6Andrey Deryabin2012-04-271-1/+1
|
* fix tests for sqlite3Andrey Deryabin2012-04-271-1/+1
|
* merged sqlite and sqlite3 adaptersAndrey Deryabin2012-04-272-546/+538
|
* Missing git add :trollface:Yehuda Katz2012-04-264-0/+288
|
* Initial queue implementationYehuda Katz2012-04-268-3/+45
|
* Merge pull request #6004 from lest/patch-1Jon Leighton2012-04-261-2/+2
|\ | | | | remove calls to deprecated find(:first) in actionpack test suite
| * remove calls to deprecated find(:first) in actionpack test suiteSergey Nartimov2012-04-261-2/+2
|/
* Merge pull request #6002 from lest/patch-1Jeremy Kemper2012-04-262-4/+4
|\ | | | | Tiny refactoring in NumberHelper and RecordTagHelper
| * refactor content_tag_for helperSergey Nartimov2012-04-261-3/+3
| | | | | | | | | | - do not use merge! just for 2 values - there is no need to check block arity
| * use safe_join in number helperSergey Nartimov2012-04-261-1/+1
|/
* Merge pull request #6001 from nashby/patch-2Jeremy Kemper2012-04-261-3/+3
|\ | | | | remove unnecessary else statement
| * remove unnecessary else statementVasiliy Ermolovich2012-04-261-3/+3
|/
* remove calls to find(:first), find(:last) and find(:all)Jon Leighton2012-04-2627-119/+114
|
* remove deprecate #all usageJon Leighton2012-04-264-7/+3
|
* remove deprecated #first callsJon Leighton2012-04-263-28/+3
|
* remove deprecate #calculate callsJon Leighton2012-04-2611-146/+72
|
* remove deprecated #find_in_batches callsJon Leighton2012-04-262-15/+3
|
* Merge pull request #5997 from ↵Xavier Noria2012-04-261-3/+4
|\ | | | | | | | | avakhov/test_namespaced_controller_dont_indent_blank_lines-refac Namedspaced generator indent method test refactoring
| * Namedspaced generator indent method test refactoringAlexey Vakhov2012-04-261-3/+4
| |
* | 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
| | | |