aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Xavier Noria2010-04-0342-592/+653
|\
| * Bring back +extra_conditions+. This effectively reverts ↵Carl Lerche2010-04-032-4/+5
| | | | | | | | 386b7bfd9d78a6d8c8bc7cc4a310df806ad0ba57
| * Raise a StatementInvalid error when trying to build a condition with hash ↵Carl Lerche2010-04-031-1/+3
| | | | | | | | keys that do not correspond to columns.
| * Sanitize association conditions using the correct classCarl Lerche2010-04-031-1/+1
| |
| * Refactored url_for in AV to have its own instances of the helpers instead of ↵wycats2010-04-0314-313/+338
| | | | | | | | proxying back to the controller. This potentially allows for more standalone usage of AV. It also kicked up a lot of dust in the tests, which were mocking out controllers to get this behavior. By moving it to the view, it made a lot of the tests more standalone (a win)
| * Make the query built by has_many ...., :dependent => :____ lazy since all ↵Carl Lerche2010-04-022-50/+32
| | | | | | | | the information is not really available yet.
| * Remove an unused argumentCarl Lerche2010-04-021-2/+1
| |
| * Fix memory leak in dev modewycats2010-04-022-0/+17
| |
| * Improve scope docsPratik Naik2010-04-031-30/+14
| |
| * Improve named scope lambdaPratik Naik2010-04-031-13/+4
| |
| * Remove unnecessary argument for creating scopesPratik Naik2010-04-031-4/+4
| |
| * Fixing index style [#4313 state:committed]Santiago Pastorino2010-04-021-1/+2
| | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
| * Key partial name cache on controller and object class *names* to avoid ↵Jeremy Kemper2010-04-021-2/+2
| | | | | | | | memory leaks in dev mode
| * CI: omit ruby-debug19 from Gemfile since the ruby source dep hoses permissionsJeremy Kemper2010-04-021-1/+1
| |
| * delegate unknown timezones to TZInfoSantiago Pastorino2010-04-022-5/+20
| |
| * utc_offset is no longer required on TimeZone and if it's not supplied we ↵Santiago Pastorino2010-04-021-61/+18
| | | | | | | | delegate to TZInfo
| * Add a test which ensures action_dispatch.show_exceptions is properly disabled.José Valim2010-04-023-4/+8
| |
| * Raise exceptions instead of rendering error templates in test environment ↵Rolf Bjaanes2010-04-023-2/+6
| | | | | | | | | | | | [#4315 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Make Relation#inspect less noisyPratik Naik2010-04-021-0/+4
| |
| * Goodbye ActiveRecord::NamedScope::ScopePratik Naik2010-04-023-36/+29
| |
| * Make Relation#first and Relation#last behave like named scope'sPratik Naik2010-04-022-18/+18
| |
| * Scope#method_missing can safely rely on Relation#method_missingPratik Naik2010-04-021-10/+0
| |
| * Scope#current_scoped_methods_when_defined is no longer neededPratik Naik2010-04-021-13/+2
| |
| * Merge branch 'master' of git://github.com/rails/railsJosé Valim2010-04-029-16/+81
| |\
| | * Oops :extends is not a MULTI_VALUE_METHODPratik Naik2010-04-021-1/+1
| | |
| | * Add Relation extensionsPratik Naik2010-04-027-15/+68
| | |
| | * Consistency when using Relation constantsPratik Naik2010-04-021-2/+2
| | |
| | * errors.rb needs to be declared as UTF-8 [#3941 state:resolved]Aaron Patterson2010-04-022-0/+12
| | | | | | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
| * | Maintain the usage of :as consistent in the router. Whenever it's supplied, ↵José Valim2010-04-022-33/+71
| |/ | | | | | | it changes the NAMED ROUTE. If you want to change the PATH, use :path instead. Example: resources :projects, :path => 'projetos'
* | guides: warn about edge guides at the top of the home preamble, and mention ↵Xavier Noria2010-04-021-11/+15
| | | | | | | | that only for edge guides, stable guides need no warning
* | guides: badge insertion was a quick hack, rewrites thatXavier Noria2010-04-023-13/+28
| |
* | Routing guide updated for new Routes DSL. It still misses the new features.Rizwan Reza2010-04-021-117/+28
| |
* | Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-04-0238-349/+462
|\|
| * Restore changed_attributes method in ActiveModel::Dirty and loosen ↵Sam Pohlenz2010-04-012-13/+12
| | | | | | | | | | | | | | | | expectation on including class' initialize method. [#4308 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Slightly less annoying check for acceptable mime_types. This allows Accept: ↵Paul Sadauskas2010-04-011-2/+2
| | | | | | | | application/json, application/jsonp (and the like), but still blacklists browsers. Essentially, we use normal content negotiation unless you include */* in your list, in which case we assume you're a browser and send HTML [#3541 state:resolved]
| * Fix class_attribute so that it works with singleton classes.Carl Lerche2010-04-012-1/+7
| |
| * Release is today, yoDavid Heinemeier Hansson2010-04-015-5/+10
| |
| * Updated changelogs to differentiate beta1 and beta2wycats2010-04-016-8/+15
| |
| * Updated changelogswycats2010-04-015-259/+320
| |
| * Bump this guy tooDavid Heinemeier Hansson2010-04-011-1/+1
| |
| * Neat and tidy, I sayDavid Heinemeier Hansson2010-04-015-14/+19
| |
| * Make your bed and clean up your gemspecs!David Heinemeier Hansson2010-04-011-10/+10
| |
| * Not needed with RubyGems 1.3.6David Heinemeier Hansson2010-04-011-27/+0
| |
| * Prep for beta2, depend on latest BundlerDavid Heinemeier Hansson2010-04-0110-10/+10
| |
| * Read postgresql encoding using string key instead of symbol [#4304 ↵Doug Richardson2010-04-011-1/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: wycats <wycats@gmail.com>
| * Fix error in number_with_precision with :significant option and zero value ↵Bernardo de Pádua2010-04-012-2/+15
| | | | | | | | | | | | [#4306 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * HTML safety: give a deprecation warning if an array of option tags is passed ↵Jeremy Kemper2010-03-312-0/+10
| | | | | | | | to select tag. Be sure to join the tag yourself and mark them .html_safe
| * Missed __FILE__Jeremy Kemper2010-03-311-1/+1
| |
| * Add tests for postgresql column type mapping updates [#4270 state:resolved]Ernie Miller2010-03-311-0/+17
| | | | | | | | Signed-off-by: Emilio Tagua <miloops@gmail.com>
| * Fix mapping of bigint/smallint/uuid columns in postgresql adapter.Ernie Miller2010-03-312-1/+8
| | | | | | | | Signed-off-by: Emilio Tagua <miloops@gmail.com>