aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge pull request #6002 from lest/patch-1Jeremy Kemper2012-04-262-4/+4
| |\ \ \ \ \
| | * | | | | refactor content_tag_for helperSergey Nartimov2012-04-261-3/+3
| | * | | | | 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 statementVasiliy Ermolovich2012-04-261-3/+3
| |/ / / / /
* / / / / / don't need this testJon Leighton2012-04-261-5/+0
|/ / / / /
* | | | | 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 avakhov/test_namespaced_controller_dont_indent_...Xavier Noria2012-04-261-3/+4
|\ \ \ \ \
| * | | | | 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 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.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
* | | | 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
|\ \ \ \
| * | | | Restore .to_s to escape_hstoreRyan Fitzgerald2012-04-241-1/+1
| * | | | Always quote hstore keys and valuesRyan Fitzgerald2012-04-242-3/+10
* | | | | 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
* | | | | | Merge remote-tracking branch 'kennyj/fix_5563'Jon Leighton2012-04-255-4/+17
|\ \ \ \ \ \
| * | | | | | 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 active_record_deprecated_fin...Jon Leighton2012-04-252-122/+4
* | | | | | | 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 r...Jon Leighton2012-04-252-3/+3
* | | | | | | 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 generatorsAlexey Vakhov2012-04-252-1/+9
* | | | | | | | Merge pull request #5878 from oscardelben/refactor_observed_classVijay Dev2012-04-251-5/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Refactor Observer.observed_classOscar Del Ben2012-04-251-5/+2
| |/ / / / / /