Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove deprecated calls | Jon Leighton | 2012-04-27 | 12 | -94/+93 |
| | |||||
* | Revert "Merge pull request #5995 from kennyj/fix_5847-3" | José Valim | 2012-04-27 | 2 | -27/+0 |
| | | | | | | | | Active Record should be lazy loaded and this pull request forced Active Record to always be loaded after initialization. This reverts commit 8cd14c0bc9f9429f03d1181912355d2f48b98157, reversing changes made to 2f0c8c52e66f1a2a3d1c00efc207f227124e96c2. | ||||
* | Merge pull request #5989 from arunagw/warning_removed_master_ap | Jon Leighton | 2012-04-27 | 1 | -3/+3 |
|\ | | | | | Shadowing variable warning removed | ||||
| * | Shadowing variable warning removed | Arun Agrawal | 2012-04-26 | 1 | -3/+3 |
| | | |||||
* | | more deprecations manually fixed | Jon Leighton | 2012-04-27 | 3 | -58/+53 |
| | | |||||
* | | find and replace deprecated keys | Jon Leighton | 2012-04-27 | 21 | -220/+220 |
| | | |||||
* | | allow AssociationProxy#scoped to take options so that API is the same as ↵ | Jon Leighton | 2012-04-27 | 2 | -2/+10 |
| | | | | | | | | Base#scoped | ||||
* | | %s/find(:\(first\|last\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other ↵ | Jon Leighton | 2012-04-27 | 30 | -415/+333 |
| | | | | | | | | things | ||||
* | | remove unnecessary test code | Jon Leighton | 2012-04-27 | 2 | -9/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/rails | Jon Leighton | 2012-04-27 | 23 | -564/+885 |
|\ \ | |||||
| * \ | Merge pull request #6011 from aderyabin/nosqlite | Jon Leighton | 2012-04-27 | 7 | -552/+543 |
| |\ \ | | | | | | | | | Remove old sqlite adapter | ||||
| | * | | fix tests for SQLite3Adapter | Andrey Deryabin | 2012-04-27 | 4 | -4/+3 |
| | | | | |||||
| | * | | renamed class SQLiteColumn to SQLite3Column | Andrey Deryabin | 2012-04-27 | 1 | -3/+3 |
| | | | | |||||
| | * | | removed tail of old sqlite versions | Andrey Deryabin | 2012-04-27 | 1 | -9/+9 |
| | | | | |||||
| | * | | fix SQLite3Adapter doc | Andrey Deryabin | 2012-04-27 | 1 | -2/+2 |
| | | | | |||||
| | * | | Upgrade sqlite3 version to 1.3.6 | Andrey Deryabin | 2012-04-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix tests for sqlite3 | Andrey Deryabin | 2012-04-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | merged sqlite and sqlite3 adapters | Andrey Deryabin | 2012-04-27 | 2 | -546/+538 |
| |/ / | |||||
| * | | Missing git add :trollface: | Yehuda Katz | 2012-04-26 | 4 | -0/+288 |
| | | | |||||
| * | | Initial queue implementation | Yehuda Katz | 2012-04-26 | 8 | -3/+45 |
| | | | |||||
| * | | Merge pull request #6004 from lest/patch-1 | Jon Leighton | 2012-04-26 | 1 | -2/+2 |
| |\ \ | | | | | | | | | remove calls to deprecated find(:first) in actionpack test suite | ||||
| | * | | remove calls to deprecated find(:first) in actionpack test suite | Sergey Nartimov | 2012-04-26 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #6002 from lest/patch-1 | Jeremy Kemper | 2012-04-26 | 2 | -4/+4 |
| |\ \ | | | | | | | | | Tiny refactoring in NumberHelper and RecordTagHelper | ||||
| | * | | refactor content_tag_for helper | Sergey Nartimov | 2012-04-26 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | - do not use merge! just for 2 values - there is no need to check block arity | ||||
| | * | | use safe_join in number helper | Sergey Nartimov | 2012-04-26 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #6001 from nashby/patch-2 | Jeremy Kemper | 2012-04-26 | 1 | -3/+3 |
| |\ \ | | | | | | | | | remove unnecessary else statement | ||||
| | * | | remove unnecessary else statement | Vasiliy Ermolovich | 2012-04-26 | 1 | -3/+3 |
| |/ / | |||||
* / / | don't need this test | Jon Leighton | 2012-04-26 | 1 | -5/+0 |
|/ / | |||||
* | | remove calls to find(:first), find(:last) and find(:all) | Jon Leighton | 2012-04-26 | 27 | -119/+114 |
| | | |||||
* | | remove deprecate #all usage | Jon Leighton | 2012-04-26 | 4 | -7/+3 |
| | | |||||
* | | remove deprecated #first calls | Jon Leighton | 2012-04-26 | 3 | -28/+3 |
| | | |||||
* | | remove deprecate #calculate calls | Jon Leighton | 2012-04-26 | 11 | -146/+72 |
| | | |||||
* | | remove deprecated #find_in_batches calls | Jon Leighton | 2012-04-26 | 2 | -15/+3 |
| | | |||||
* | | Merge pull request #5997 from ↵ | Xavier Noria | 2012-04-26 | 1 | -3/+4 |
|\ \ | | | | | | | | | | | | | avakhov/test_namespaced_controller_dont_indent_blank_lines-refac Namedspaced generator indent method test refactoring | ||||
| * | | Namedspaced generator indent method test refactoring | Alexey Vakhov | 2012-04-26 | 1 | -3/+4 |
| | | | |||||
* | | | Merge pull request #5998 from aderyabin/fix7 | Xavier Noria | 2012-04-26 | 2 | -24/+25 |
|\ \ \ | |/ / |/| | | EXPLAIN only for sqlite3 | ||||
| * | | EXPLAIN only for sqlite3 | Andrey Deryabin | 2012-04-26 | 2 | -24/+25 |
|/ / | |||||
* | | Merge pull request #5995 from kennyj/fix_5847-3 | Jon Leighton | 2012-04-26 | 2 | -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. | kennyj | 2012-04-26 | 2 | -0/+27 |
| | | | |||||
* | | | remove deprecate #update_all usage | Jon Leighton | 2012-04-26 | 4 | -12/+6 |
| | | | |||||
* | | | fix #scoped deprecations | Jon Leighton | 2012-04-26 | 4 | -15/+16 |
| | | | |||||
* | | | remove deprecated scope stuff | Jon Leighton | 2012-04-26 | 5 | -54/+2 |
| | | | |||||
* | | | default_scope with a hash is deprecated | Jon Leighton | 2012-04-26 | 1 | -10/+0 |
|/ / | |||||
* / | fix number_to_human docs [ci skip] | Vijay Dev | 2012-04-26 | 1 | -2/+2 |
|/ | |||||
* | Routes reloader knows how to reload external files | Yehuda Katz | 2012-04-25 | 3 | -4/+73 |
| | |||||
* | Fix missing Rails.env in route inspect tests | Yehuda Katz | 2012-04-25 | 1 | -0/+1 |
| | |||||
* | Fix the build | Yehuda Katz | 2012-04-25 | 2 | -2/+3 |
| | |||||
* | Make files in paths consistent | Yehuda Katz | 2012-04-25 | 1 | -1/+1 |
| | |||||
* | Allow loading external route files from the router | Jose and Yehuda | 2012-04-25 | 9 | -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 method | Jon Leighton | 2012-04-25 | 1 | -6/+0 |
| |