aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Explicitly define main_app proxyPiotr Sarnacki2011-04-252-2/+5
* Add Engine#helpers method which loads all the engine's helpersPiotr Sarnacki2011-04-252-0/+84
* Go with latest Sass directlyDavid Heinemeier Hansson2011-04-251-1/+1
* Fix tests.José Valim2011-04-252-7/+3
* rename test case to better describe use caseDavid Chelimsky2011-04-251-6/+6
* No need to check for both full and mountable.Prem Sichanugrist2011-04-251-1/+1
* Add `app/assets/images` directory to plugin new generatorPrem Sichanugrist2011-04-252-0/+14
* Temporarily disable uglifier until a new version depending on execjs 0.2.0 ca...David Heinemeier Hansson2011-04-242-2/+2
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2011-04-2414-74/+311
|\
| * minor correction to the AMo mass-assignment security docsJosh Kalderimis2011-04-241-1/+1
| * added config.active_record.whitelist_attributes which creates an empty whitel...Josh Kalderimis2011-04-244-3/+20
| * updated the security guide on the updated mass-assignment security scopes add...Josh Kalderimis2011-04-241-1/+26
| * Added assign_attributes to Active Record which accepts a mass-assignment secu...Josh Kalderimis2011-04-246-27/+132
| * AM mass assignment security attr_accessible and attr_protected now allow for ...Josh Kalderimis2011-04-244-45/+135
* | Stop adding actual dummy tests (they clutter up the real ones in a new app), ...David Heinemeier Hansson2011-04-237-28/+21
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-2317-67/+98
|\
| * copy-edits 0e2644cXavier Noria2011-04-233-3/+3
| * copy-edits e2656e0Xavier Noria2011-04-232-3/+3
| * copy-edits 3d45964Xavier Noria2011-04-232-2/+2
| * copy-edits 2f0dca5Xavier Noria2011-04-231-1/+1
| * Added docs for #drop_database on MySQL adapterSebastian Martinez2011-04-222-1/+5
| * Grammer fix on note about wildcard routesRonnie Miller2011-04-221-1/+1
| * fix block alignmentVijay Dev2011-04-231-2/+3
| * fix indentationVijay Dev2011-04-231-13/+13
| * add examples for array access methodsVijay Dev2011-04-231-0/+5
| * updating to_xml example to new AR apiVijay Dev2011-04-231-2/+2
| * Added docs for #disconnect! on adaptersSebastian Martinez2011-04-223-1/+6
| * Added missing docs for clear_cache! on adaptersSebastian Martinez2011-04-223-0/+3
| * Added missing docs for +supports_primary_key?+ on some adaptersSebastian Martinez2011-04-222-0/+2
| * Added missing docs for +support_migrations?+ on some adaptersSebastian Martinez2011-04-222-0/+2
| * Have a more connection specific rdoc for +supports_statement_cache?+Sebastian Martinez2011-04-223-6/+6
| * Removed ON() on distinct commentSebastian Martinez2011-04-221-1/+1
| * Remove HTML escaping from Record Tag Helper docs.Semyon Perepelitsa2011-04-221-3/+3
| * minor correction to the Active Model instantiate_observers docJosh Kalderimis2011-04-221-1/+1
| * Grammar fixes for Object#in? documentation.Cheah Chu Yeow2011-04-221-2/+2
| * Replace example hostname with "example.com".Joost Baaij2011-04-215-32/+32
| * document the Active Support extension - String#inquiryVijay Dev2011-04-201-0/+9
| * Exception got moved to ActiveModel with Rails 3Eric Anderson2011-04-201-1/+1
| * Fix 'FIXME' annotation typoSebastian Martinez2011-04-191-1/+1
| * NilClass is a singletonAkira Matsuda2011-04-201-1/+1
* | File watcher won't make the cut for 3.1. Maybe on 3.2.José Valim2011-04-233-235/+0
* | The example uses erbDavid Heinemeier Hansson2011-04-221-0/+0
* | Use .erb in the test.José Valim2011-04-221-2/+2
* | split indexes and column types on money / binary iterationAaron Patterson2011-04-221-6/+5
* | fetch result row arrays from pg in C and return early if there are no money o...Aaron Patterson2011-04-221-31/+36
* | set the backtrace to prevent AR exceptions from lying to usAaron Patterson2011-04-221-1/+3
* | Fixed images path in plugin_new_generatorArun Agrawal2011-04-231-1/+1
* | show http method in routing error messageSchneems2011-04-231-1/+1
* | Images path fixed in test.Arun Agrawal2011-04-231-1/+1
* | Need this for testingDavid Heinemeier Hansson2011-04-221-0/+1