aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* html_tag option to wrap error_message_on text [#4283 state:resolved]Paco Guzman2010-03-282-9/+16
* Add ActionDispatch to RDoc task [#4287 state:resolved]Andrew White2010-03-281-0/+1
* Why are we not updating bundler?wycats2010-03-281-1/+1
* Drop expires argument from call to @data in MemCacheStore so it works with me...Vladimir Andrijevik2010-03-282-1/+7
* defining a named_scope which overwrites an existing method is now allowed we ...Matthew Rudy Jacobs2010-03-282-3/+17
* Request#content_type exists in Rack::Request, and other parts of Rack::Reques...wycats2010-03-285-14/+20
* Add constraints to resources in new routing DSLAndrew White2010-03-282-14/+73
* 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 tha...Mikel Lindsaar2010-03-281-1/+1
| * 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
| * | | | | 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
| |_|/ |/| |
* | | 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 wait...José Valim2010-03-275-19/+21
* | | 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 broken...Jeremy Kemper2010-03-271-1/+7
* | | 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 state:res...Santiago Pastorino2010-03-271-2/+2
* | | LINE on class_eval need + 1, also removed comments [#4281 state:committed]Santiago Pastorino2010-03-272-44/+47
* | | flatten not needed hereSantiago Pastorino2010-03-271-2/+2
* | | Revert "primary_key now supports :limit for MySQL". Break Sam Ruby app.José Valim2010-03-275-57/+34
* | | Do not need to load ActionPack::VERSIONJosé Valim2010-03-271-2/+0
* | | Remove stray instance variable to resolve serialization problem [#3769 state:...wycats2010-03-271-3/+9
* | | Don't write to /dev/null on mingw. [#3921 state:resolved] (ht: Patrick Daryl...wycats2010-03-271-1/+1
* | | Use the new RAILS_VERSION in rake install (ht: ZhangJinzhu) [#4116 state:reso...wycats2010-03-271-3/+5
* | | primary_key now supports :limit for MySQLRizwan Reza2010-03-275-34/+57
* | | Fixes a bug where error_messages_for was returning an empty div [#4048 state:...wycats2010-03-272-1/+5
* | | Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-03-279-12/+102
|\ \ \
| * | | Limit Array#extract_options! to directl instances of Hash and HWIA. Add extra...wycats2010-03-273-1/+54
| * | | fixing inconsistency with cattr_reader and matter_reader [#4172 state:resolved]Kabari Hendrick2010-03-274-11/+30
| * | | Recovers error_messages for ActiveRecordInstanceTag. [#4078 state:resolved]Daniel Rodríguez Troitiño2010-03-272-0/+18
* | | | Revert "primary_key now supports :limit. [#876 state:resolved]" since it brok...José Valim2010-03-275-57/+34