Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reapply Rizwan's patch, but memoize Bundler.load.specs in an ivar. [#3697 ↵ | Rizwan Reza | 2010-03-28 | 1 | -41/+34 |
| | | | | | state:resolved] Signed-off-by: wycats <wycats@gmail.com> | ||||
* | html_tag option to wrap error_message_on text [#4283 state:resolved] | Paco Guzman | 2010-03-28 | 2 | -9/+16 |
| | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Add ActionDispatch to RDoc task [#4287 state:resolved] | Andrew White | 2010-03-28 | 1 | -0/+1 |
| | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Why are we not updating bundler? | wycats | 2010-03-28 | 1 | -1/+1 |
| | |||||
* | Drop expires argument from call to @data in MemCacheStore so it works with ↵ | Vladimir Andrijevik | 2010-03-28 | 2 | -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 Jacobs | 2010-03-28 | 2 | -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 ↵ | wycats | 2010-03-28 | 5 | -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 DSL | Andrew White | 2010-03-28 | 2 | -14/+73 |
| | | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com> | ||||
* | Bump mail dep to 2.1.5.1 | Jeremy Kemper | 2010-03-28 | 1 | -1/+1 |
| | |||||
* | Merge remote branch 'mikel/master' | Jeremy Kemper | 2010-03-28 | 3 | -13/+29 |
|\ | |||||
| * | Updating mail version requirement to 2.1.5 | Mikel Lindsaar | 2010-03-28 | 1 | -1/+1 |
| | | |||||
| * | Fixing up attachment encoding specs to work with latest mail - and be correct | Mikel Lindsaar | 2010-03-28 | 1 | -2/+18 |
| | | |||||
| * | Mail now correctly bundles up the charset into the content type field | Mikel Lindsaar | 2010-03-28 | 1 | -7/+7 |
| | | |||||
| * | Updating test, should be calling :decoded, not :encoded, is a problem now ↵ | Mikel Lindsaar | 2010-03-28 | 1 | -1/+1 |
| | | | | | | | | that Mail is fixed | ||||
| * | Fixing test, ; is a delimiter, not a termination character, ref RFC 2045 | Mikel Lindsaar | 2010-03-28 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-03-28 | 466 | -3272/+6320 |
| |\ | |||||
| * \ | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-03-11 | 193 | -2800/+2910 |
| |\ \ | |||||
| * | | | Removing prototype and just using vanilla js | Mikel Lindsaar | 2010-03-03 | 1 | -17/+17 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:rails/rails | Jeremy Kemper | 2010-03-28 | 61 | -6/+147 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote branch 'rizwan/restrict' | wycats | 2010-03-28 | 59 | -4/+143 |
| |\ \ \ \ | |||||
| | * | | | | Add :dependent = to has_one and has_many [#3075 state:resolved] | Rizwan Reza | 2010-03-28 | 5 | -4/+66 |
| | | | | | | |||||
| | * | | | | adds missing requires for Object#blank? and Object#present? | Xavier Noria | 2010-03-28 | 51 | -0/+69 |
| | | | | | | |||||
| | * | | | | adds missing requires for Object#duplicable? | Xavier Noria | 2010-03-28 | 4 | -0/+5 |
| | | | | | | |||||
| | * | | | | adds a few requires in active_model/dirty.rb | Xavier Noria | 2010-03-28 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | [#4284 state:committed] | ||||
| * | | | | | Rails 3 application can run performance tests now. [#4171 state:resolved] | Rizwan Reza | 2010-03-28 | 2 | -2/+4 |
| |/ / / / | |||||
* / / / / | Cosmetics: mismatch indentation | Jeremy Kemper | 2010-03-28 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Oops, a docfix. | Rizwan Reza | 2010-03-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | When creating database with rake, create schemas in schema_search_path if it ↵ | Rizwan Reza | 2010-03-28 | 4 | -0/+40 |
| |_|/ |/| | | | | | | | | doesn't exist. | ||||
* | | | Time zone tests were right all along. | José Valim | 2010-03-28 | 1 | -4/+4 |
| | | | |||||
* | | | Fixes typo in environments/production.rb template. | watsonian | 2010-03-27 | 1 | -1/+1 |
| | | | |||||
* | | | Ensure details are frozen after @details_keys lookup. The implementation ↵ | José Valim | 2010-03-27 | 5 | -19/+21 |
| | | | | | | | | | | | | waits to freeze until the last required moment, to avoid duping hashes. | ||||
* | | | Missing require | wycats | 2010-03-27 | 1 | -0/+1 |
| | | | |||||
* | | | Actually check the value of the ivar | wycats | 2010-03-27 | 1 | -4/+2 |
| | | | |||||
* | | | Bust gem prelude to ensure bundler's in the load path. Not sure what's ↵ | Jeremy Kemper | 2010-03-27 | 1 | -1/+7 |
| | | | | | | | | | | | | broken here. | ||||
* | | | Use Array.wrap uniformly | Jeremy Kemper | 2010-03-27 | 5 | -7/+12 |
| | | | |||||
* | | | Fix unstated dep on HWIA | Jeremy Kemper | 2010-03-27 | 1 | -0/+2 |
| | | | |||||
* | | | Ruby's marshaling of Time instances doesn't respect the zone [#4282 ↵ | Santiago Pastorino | 2010-03-27 | 1 | -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 Pastorino | 2010-03-27 | 2 | -44/+47 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | flatten not needed here | Santiago Pastorino | 2010-03-27 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | Revert "primary_key now supports :limit for MySQL". Break Sam Ruby app. | José Valim | 2010-03-27 | 5 | -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::VERSION | José Valim | 2010-03-27 | 1 | -2/+0 |
| | | | |||||
* | | | Remove stray instance variable to resolve serialization problem [#3769 ↵ | wycats | 2010-03-27 | 1 | -3/+9 |
| | | | | | | | | | | | | state:resolved] (ht: Joe Rafaniello) | ||||
* | | | Don't write to /dev/null on mingw. [#3921 state:resolved] (ht: Patrick ↵ | wycats | 2010-03-27 | 1 | -1/+1 |
| | | | | | | | | | | | | Daryll Glandien) | ||||
* | | | Use the new RAILS_VERSION in rake install (ht: ZhangJinzhu) [#4116 ↵ | wycats | 2010-03-27 | 1 | -3/+5 |
| | | | | | | | | | | | | state:resolved] | ||||
* | | | primary_key now supports :limit for MySQL | Rizwan Reza | 2010-03-27 | 5 | -34/+57 |
| | | | | | | | | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | | | Fixes a bug where error_messages_for was returning an empty div [#4048 ↵ | wycats | 2010-03-27 | 2 | -1/+5 |
| | | | | | | | | | | | | state:resolved] (ht: Geoff Garside) | ||||
* | | | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-03-27 | 9 | -12/+102 |
|\ \ \ | |||||
| * | | | Limit Array#extract_options! to directl instances of Hash and HWIA. Add ↵ | wycats | 2010-03-27 | 3 | -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 Hendrick | 2010-03-27 | 4 | -11/+30 |
| | | | | | | | | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | | | Recovers error_messages for ActiveRecordInstanceTag. [#4078 state:resolved] | Daniel Rodríguez Troitiño | 2010-03-27 | 2 | -0/+18 |
| | | | | | | | | | | | | Signed-off-by: wycats <wycats@gmail.com> |