aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Why are we not updating bundler?wycats2010-03-281-1/+1
|
* Drop expires argument from call to @data in MemCacheStore so it works with ↵Vladimir Andrijevik2010-03-282-1/+7
| | | | | memcache-client and memcached gems, as advertised [#3672 state:resolved] Signed-off-by: wycats <wycats@gmail.com>
* defining a named_scope which overwrites an existing method is now allowed we ↵Matthew Rudy Jacobs2010-03-282-3/+17
| | | | | | | | | just log a warning. This was motivated by the fact that :open is defined on all classes as such the named_scope "open" can never be used, without hacking ActiveRecord with an "undef_method" [#4083 state:resolved] Signed-off-by: wycats <wycats@gmail.com>
* Request#content_type exists in Rack::Request, and other parts of ↵wycats2010-03-285-14/+20
| | | | | | Rack::Request expect it to return a String. Split the Rails API so that Request#content_type returns a String, and Request#content_mime_type returns a Mime::Type object.
* Add constraints to resources in new routing DSLAndrew White2010-03-282-14/+73
| | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
* Bump mail dep to 2.1.5.1Jeremy Kemper2010-03-281-1/+1
|
* Merge remote branch 'mikel/master'Jeremy Kemper2010-03-283-13/+29
|\
| * Updating mail version requirement to 2.1.5Mikel Lindsaar2010-03-281-1/+1
| |
| * Fixing up attachment encoding specs to work with latest mail - and be correctMikel Lindsaar2010-03-281-2/+18
| |
| * Mail now correctly bundles up the charset into the content type fieldMikel Lindsaar2010-03-281-7/+7
| |
| * Updating test, should be calling :decoded, not :encoded, is a problem now ↵Mikel Lindsaar2010-03-281-1/+1
| | | | | | | | that Mail is fixed
| * Fixing test, ; is a delimiter, not a termination character, ref RFC 2045Mikel Lindsaar2010-03-281-2/+2
| |
| * Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-03-28466-3272/+6320
| |\
| * \ Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-03-11193-2800/+2910
| |\ \
| * | | Removing prototype and just using vanilla jsMikel Lindsaar2010-03-031-17/+17
| | | |
* | | | 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>