aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added assign_attributes to Active Record which accepts a mass-assignment ↵Josh Kalderimis2011-04-246-27/+132
| | | | security scope using the :as option, while also allowing mass-assignment security to be bypassed using :with_protected
* AM mass assignment security attr_accessible and attr_protected now allow for ↵Josh Kalderimis2011-04-244-45/+135
| | | | | | | | scopes using :as => scope eg. attr_accessible :name attr_accessible :name, :admin, :as => :admin
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-2317-67/+98
|\ | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
| * 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
| | | | | | | | | | The hostname used in these comments actually exists, which is undesirable. See also RFC 2606.
| * 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 ↵Aaron Patterson2011-04-221-31/+36
| | | | | | | | or binary columns. :heart:
* | 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
| |
* | We cant use assert_block because its buggy in MiniTest and wont actually ↵David Heinemeier Hansson2011-04-221-1/+1
| | | | | | | | show you the failure message you provide -- instead you just always get a "Expected block to return true"
* | removing incorrect comment and string concatenationAaron Patterson2011-04-221-4/+1
| |
* | Added test case and fix for proper eager loading associationsPavel Forkert2011-04-221-0/+10
| |
* | bumping the pg requirementsAaron Patterson2011-04-221-1/+1
| |
* | The #substitute_at gets an ActiveRecord::ConnectionAdapters::Column in ↵Ken Collins2011-04-231-1/+1
| | | | | | | | #insert to match replacement in #exec_query.
* | Turn on JS/CSS compression by defaultDavid Heinemeier Hansson2011-04-222-0/+5
| |
* | Add shorthand for js and css compressorsJoshua Peek2011-04-222-0/+40
| |
* | Move #exec_insert to abstract adapter's database statements.Ken Collins2011-04-224-12/+7
| |
* | stop using distinct on for the unique id queries. [#6450 state:resolved]Aaron Patterson2011-04-212-1/+3
| |
* | Only include SprocketsHelper into assets contextJoshua Peek2011-04-211-3/+4
| |
* | Fix tests on 1.8 by explicitly checking for strings (which also improves ↵José Valim2011-04-201-1/+9
|/ | | | performance).
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-191-4/+4
|\
| * correction to the i18n locale filter examplesJosh Kalderimis2011-04-191-4/+4
| |