aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/railsJeremy Kemper2010-03-2861-6/+147
|\
| * Merge remote branch 'rizwan/restrict'wycats2010-03-2859-4/+143
| |\
| | * Add :dependent = to has_one and has_many [#3075 state:resolved]Rizwan Reza2010-03-285-4/+66
| | |
| | * adds missing requires for Object#blank? and Object#present?Xavier Noria2010-03-2851-0/+69
| | |
| | * adds missing requires for Object#duplicable?Xavier Noria2010-03-284-0/+5
| | |
| | * adds a few requires in active_model/dirty.rbXavier Noria2010-03-281-0/+3
| | | | | | | | | | | | [#4284 state:committed]
| * | Rails 3 application can run performance tests now. [#4171 state:resolved]Rizwan Reza2010-03-282-2/+4
| |/
* / Cosmetics: mismatch indentationJeremy Kemper2010-03-281-1/+1
|/
* Oops, a docfix.Rizwan Reza2010-03-281-1/+1
|
* When creating database with rake, create schemas in schema_search_path if it ↵Rizwan Reza2010-03-284-0/+40
| | | | doesn't exist.
* Time zone tests were right all along.José Valim2010-03-281-4/+4
|
* Fixes typo in environments/production.rb template.watsonian2010-03-271-1/+1
|
* Ensure details are frozen after @details_keys lookup. The implementation ↵José Valim2010-03-275-19/+21
| | | | waits to freeze until the last required moment, to avoid duping hashes.
* Missing requirewycats2010-03-271-0/+1
|
* Actually check the value of the ivarwycats2010-03-271-4/+2
|
* Bust gem prelude to ensure bundler's in the load path. Not sure what's ↵Jeremy Kemper2010-03-271-1/+7
| | | | broken here.
* Use Array.wrap uniformlyJeremy Kemper2010-03-275-7/+12
|
* Fix unstated dep on HWIAJeremy Kemper2010-03-271-0/+2
|
* Ruby's marshaling of Time instances doesn't respect the zone [#4282 ↵Santiago Pastorino2010-03-271-2/+2
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* LINE on class_eval need + 1, also removed comments [#4281 state:committed]Santiago Pastorino2010-03-272-44/+47
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* flatten not needed hereSantiago Pastorino2010-03-271-2/+2
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Revert "primary_key now supports :limit for MySQL". Break Sam Ruby app.José Valim2010-03-275-57/+34
| | | | | | To reproduce, start a new application, create a scaffold and run test suite. [#876 state:open] This reverts commit faeca694b3d4afebf6b623b493e86731e773c462.
* Do not need to load ActionPack::VERSIONJosé Valim2010-03-271-2/+0
|
* Remove stray instance variable to resolve serialization problem [#3769 ↵wycats2010-03-271-3/+9
| | | | state:resolved] (ht: Joe Rafaniello)
* Don't write to /dev/null on mingw. [#3921 state:resolved] (ht: Patrick ↵wycats2010-03-271-1/+1
| | | | Daryll Glandien)
* Use the new RAILS_VERSION in rake install (ht: ZhangJinzhu) [#4116 ↵wycats2010-03-271-3/+5
| | | | state:resolved]
* primary_key now supports :limit for MySQLRizwan Reza2010-03-275-34/+57
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Fixes a bug where error_messages_for was returning an empty div [#4048 ↵wycats2010-03-272-1/+5
| | | | state:resolved] (ht: Geoff Garside)
* Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-03-279-12/+102
|\
| * Limit Array#extract_options! to directl instances of Hash and HWIA. Add ↵wycats2010-03-273-1/+54
| | | | | | | | extractable_options? to Hash so that subclasses of Hash can opt-into extractable behavior. This fixes an issue where respond_with wasn't working with subclasses of Hash that were provided by other libraries (such as CouchDB or Mashie) [#4145 state:resolved]
| * fixing inconsistency with cattr_reader and matter_reader [#4172 state:resolved]Kabari Hendrick2010-03-274-11/+30
| | | | | | Signed-off-by: wycats <wycats@gmail.com>
| * Recovers error_messages for ActiveRecordInstanceTag. [#4078 state:resolved]Daniel Rodríguez Troitiño2010-03-272-0/+18
| | | | | | Signed-off-by: wycats <wycats@gmail.com>
* | Revert "primary_key now supports :limit. [#876 state:resolved]" since it ↵José Valim2010-03-275-57/+34
| | | | | | | | | | | | broke AR test suite. This reverts commit 41e5c7ed44fedb95636ef9b7a792c46ea03309bd.
* | Fix tests added in previous commit.José Valim2010-03-272-0/+6
| |
* | ActiveModel::Dirty#changes should return a HashWithIndifferentAccess [#4157 ↵Jacob Atzen2010-03-272-1/+30
| | | | | | | | | | | | | | | | state:resolved] Keep the Rails style of inject Signed-off-by: José Valim <jose.valim@gmail.com>
* | Do not check for a valid const name in Rails 3.0 applications. [#4200 ↵José Valim2010-03-271-1/+2
|/ | | | state:resolved]
* avoiding a few closure references by evaling. [#4223 state:resolved]Aaron Patterson2010-03-271-12/+18
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Makes ActiveResource work with form_for: - Adds a `build' method that can be ↵Gaël Deest2010-03-271-0/+49
| | | | | used instead of `new' to load a new, unsaved resource from the remote site, filled with the correct default values. - Adds a `persisted?' method that simply returns the opposite value than the `new?' method. [#4222 state:resolved] [#4155 state:resolved] Signed-off-by: wycats <wycats@gmail.com>
* primary_key now supports :limit. [#876 state:resolved]Rizwan Reza2010-03-275-34/+57
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Revert "Changed behavior of touch and added touch! Originally implemented by ↵Pratik Naik2010-03-272-43/+8
| | | | | | Obie Fernandez, updated touch! to act as a thin wrapper to touch. [#2520 state:resolved]" This reverts commit 3a875e618487a06a56f6cf912cf5440f294921cc.
* Use ActiveSupport::Autoload for view helpers. [#4237 state:resolved]Sam Elliott and Ryan Bigg2010-03-271-24/+26
| | | Signed-off-by: wycats <wycats@gmail.com>
* Fix a mistake in the documentation (ht: Evgeniy Dolzhenko) [#4217 ↵wycats2010-03-271-1/+1
| | | | state:resolved]
* Fix named routes for member actions of singleton resources [#4266 ↵Andrew White2010-03-272-1/+6
| | | | | state:resolved] Signed-off-by: wycats <wycats@gmail.com>
* Changed behavior of touch and added touch! Originally implemented by Obie ↵Nathaniel Bibler2010-03-272-8/+43
| | | | | Fernandez, updated touch! to act as a thin wrapper to touch. [#2520 state:resolved] Signed-off-by: wycats <wycats@gmail.com>
* Tests method_missing to raise NameError. [#2522 state:resolved]Rizwan Reza2010-03-271-0/+16
| | | Signed-off-by: wycats <wycats@gmail.com>
* Add parameter defaults support to new routing DSL [#4265 state:resolved]Andrew White2010-03-272-1/+39
| | | Signed-off-by: wycats <wycats@gmail.com>
* Fixes typo (ht: Claudio Poli) [#4107 state:closed]wycats2010-03-261-1/+1
|
* In PostgreSQLAdapter, switch tables query to use current_schemas function ↵Kris Selden2010-03-262-3/+10
| | | | | | [#918 state:resolved] Signed-off-by: wycats <wycats@gmail.com>
* Make X-Sendfile default to "" so it works correctly in dev mode.wycats2010-03-263-44/+46
| | | | | Provide a default in production.rb that can be modified, so that people who care about sendfile performance in production mode can get better performance easily.
* Merge branch 'master' into docrailswycats2010-03-26385-1646/+2607
|\