aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* AS guide: revises Class#reachable?Xavier Noria2010-01-171-1/+1
* AS guide: documents Class#reachable?Xavier Noria2010-01-171-0/+25
* AS guide: revises section about Class#subclassesXavier Noria2010-01-171-3/+3
* AS guide: documents Object#subclasses_ofXavier Noria2010-01-171-0/+34
* AS guide: documents Object#remove_subclasses_ofXavier Noria2010-01-171-0/+6
* Merge remote branch 'mainstream/master'Pratik Naik2010-01-170-0/+0
|\
| * Merge docrailsPratik Naik2010-01-1758-1196/+4710
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-17316-5553/+6041
|\|
| * Cache Model.arel_tablePratik Naik2010-01-171-3/+3
| * Use arel_table[] instead of unscoped[] to get arel attributePratik Naik2010-01-171-3/+3
| * Revert "Fix #microseconds conversion and #fast_string_to_time"Pratik Naik2010-01-172-50/+6
| * Rename Model.active_relation to Model.unscopedPratik Naik2010-01-177-21/+21
| * Allow custom controller for resource(s) [#3703 state:resolved]Joshua Peek2010-01-162-11/+11
| * Improve the error message for class mismatch on Relation#mergePratik Naik2010-01-171-1/+3
| * Get rid of Base#merge_includesPratik Naik2010-01-162-6/+2
| * Make guides generation work for Ruby 1.9.xRyan Bigg2010-01-162-3/+3
| * Mark title and headers as html_safe! for guides [#3702 state:resolved]Ryan Bigg2010-01-162-4/+4
| * No need to set @arel_engine to nil twice. Committed by mistake in 3968825fPratik Naik2010-01-161-1/+1
| * Make sure Model#active_relation always adds STI conditions if neededPratik Naik2010-01-164-9/+6
| * Use new finder methods for association preloadingPratik Naik2010-01-161-17/+16
| * Use Relation#apply_finder_options from calculationsPratik Naik2010-01-161-16/+3
| * Add Relation#apply_finder_options for applying old finder optionsPratik Naik2010-01-162-29/+24
| * Make script/dbconsole work again [#3690 state:resolved]Sam Granieri2010-01-161-2/+2
| * Split ActionDispatch http in smaller chunks.José Valim2010-01-168-431/+489
| * Rename active_relation_engine -> arel_engine and active_relation_table -> are...Pratik Naik2010-01-163-20/+20
| * Fix #microseconds conversion and #fast_string_to_timeChris Hapgood2010-01-162-6/+50
| * Remove protected method Class#scoped?Pratik Naik2010-01-161-9/+5
| * Make type_condition return Arel predicate and not a string conditionPratik Naik2010-01-162-6/+4
| * Remove unused default_selectPratik Naik2010-01-161-8/+0
| * Move I18n to gemspec and update dependencies.José Valim2010-01-153-5/+2
| * Add tests for simple match with namespace.José Valim2010-01-151-0/+10
| * Add some implicit path tests to Subscriber.José Valim2010-01-151-1/+18
| * Fix singleton resource named routesJoshua Peek2010-01-152-2/+5
| * Remove scope related code from construct_joinPratik Naik2010-01-162-21/+7
| * Fix const reference for SessionRestoreErrorJoshua Peek2010-01-151-1/+1
| * Always join scoped paths with slashesJoshua Peek2010-01-151-11/+17
| * Cleanup internal resource macro to use method helper shorthandJoshua Peek2010-01-152-20/+26
| * Remove stale construct_* methodsPratik Naik2010-01-161-24/+0
| * Remove construct_conditionsPratik Naik2010-01-161-11/+2
| * Simplify Model.delete_allPratik Naik2010-01-161-1/+1
| * Model.delete should just use scoped.deletePratik Naik2010-01-161-1/+1
| * Routing method shorthand shouldn't clobber :to optionsJoshua Peek2010-01-152-2/+19
| * Move Flash into middlewareJoshua Peek2010-01-1510-183/+225
| * Remove AR#scope() methodPratik Naik2010-01-162-34/+17
| * Make HEAD method masquerade as GET so requests are routed correctlyJoshua Peek2010-01-158-10/+44
| * Fix the query matching in SubscriberTestPratik Naik2010-01-161-2/+2
| * Make scopes use relations under the hoodPratik Naik2010-01-1613-330/+361
| * In heterogeneous collections, neither the @path nor the @template are availab...José Valim2010-01-152-1/+11
| * Allow f.submit to be localized per object.José Valim2010-01-152-3/+33
| * Remove URI object from ActiveResource notification, send the :mailer class in...José Valim2010-01-154-10/+8