aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added "Routing from the Outside In" guide.Mike Gunderloy2008-08-311-0/+763
|
* Typo in current_cycle example.Henrik N2008-08-281-1/+1
|
* Merge commit 'mainstream/master'Pratik Naik2008-08-28185-2454/+3832
|\ | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/callbacks.rb activeresource/lib/active_resource/base.rb
| * Implement count limit/offset support for has_many associationsTarmo Tänav2008-08-272-1/+16
| | | | | | | | | | | | [#348 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Alias included associations if needed when doing a countTarmo Tänav2008-08-272-2/+12
| | | | | | | | | | | | [#302 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Dirty: treat two changes resulting in the original value as being unchanged.Tom Lea2008-08-272-1/+40
| | | | | | | | | | | | [#798 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Added TextHelper#current_cycle to return the current cycle for better design ↵Ken Collins2008-08-273-3/+76
| | | | | | | | | | | | | | | | options. [#417 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Request#remote_ip handles the uncommon case that REMOTE_ADDR is a ↵Michael S. Klishin2008-08-272-3/+8
| | | | | | | | | | | | | | | | comma-separated list. [#523 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * PostgreSQL: fix quote_string for certain old pg drivers. [#94 state:resolved]Lars Kanis2008-08-271-1/+1
| |
| * respond_to? passes along splat args to avoid introducing the second arg if ↵Jeremy Kemper2008-08-271-2/+2
| | | | | | | | it was omitted
| * Add TestUploadFile.content_type= to match Request.UploadedFileTim Haines2008-08-272-1/+6
| | | | | | | | | | | | [#920 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Merge commit 'sven/i18n'Jeremy Kemper2008-08-276-41/+14
| |\ | | | | | | | | | | | | Conflicts: activesupport/lib/active_support.rb
| | * I18n: remove #populate from Simple backend as wellMarko Seppae2008-08-271-7/+0
| | |
| | * i18n: fixed failing tests after removing #populate and #store_translationsMarko Seppae2008-08-271-12/+7
| | |
| | * I18n: removed call to #populate from main library filesMarko Seppae2008-08-273-9/+3
| | |
| | * I18n: removed #populate and #store_translations from apiMarko Seppae2008-08-272-13/+4
| | |
| * | Moved Logger extensions into core_extJoshua Peek2008-08-273-129/+128
| | |
| * | Fix Ruby's Time marshaling bug in pre-1.9 versions of Ruby: utc instances ↵Luca Guidi2008-08-273-1/+58
| | | | | | | | | | | | are now correctly unmarshaled with a utc zone instead of the system local zone [#900 state:resolved]
| * | Formally deprecate the old secret key generatorMichael Koziarski2008-08-271-0/+1
| | |
| * | Deprecate Rails::SecretKeyGenerator in favor of ActiveSupport::SecureRandom.Hongli Lai (Phusion2008-08-277-161/+222
| | | | | | | | | | | | | | | | | | | | | SecureRandom has a few minor security enhancements and can be used as a drop-in replacement Signed-off-by: Michael Koziarski <michael@koziarski.com> [#913 state:committed]
| * | Fix two has_one :through errorspivotal2008-08-273-3/+15
| |/ | | | | | | | | | | | | | | * Set the association target on assignment; * Reset target to nil on reset, rather than empty array. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#895 state:committed]
| * Store application and other context specific helper modules in ↵Joshua Peek2008-08-263-21/+17
| | | | | | | | ActionView::Base#helpers
| * defined? has no boundsJoshua Peek2008-08-261-1/+1
| |
| * Require missing libraries and check for defined ActionController constant so ↵Joshua Peek2008-08-266-4/+30
| | | | | | | | ActionView can be used standalone
| * Performance: reduce garbage created by ↵Joshua Peek2008-08-261-1/+8
| | | | | | | | ActiveRecord::Calculations#column_alias_for
| * Cache JavaScriptGenerator's helper module set on the templateJoshua Peek2008-08-264-16/+20
| |
| * The 'rails' command was broken by the last commit. Fix that.Hongli Lai (Phusion2008-08-263-3/+11
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * When an unexpected exception is caught, tell the administrator to read the ↵Hongli Lai (Phusion2008-08-262-0/+39
| | | | | | | | | | | | log file for more information about the error. This should make things less confusing for developers who are new to Rails. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Fix yet another implicit order dependant testTarmo Tänav2008-08-261-3/+3
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Print the queries that were executed if assert_queries failsTarmo Tänav2008-08-261-1/+1
| |
| * Be more carefulMichael Koziarski2008-08-261-1/+0
| |
| * Re enable CI for postgresqlMichael Koziarski2008-08-261-7/+7
| |
| * Just look at sql_type when testing that the correct database-specific type ↵Tarmo Tänav2008-08-261-4/+1
| | | | | | | | | | | | was used Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-08-264-7/+8
| |\
| | * Include people and readers fixtures to fix test isolation errorJeremy Kemper2008-08-261-2/+2
| | |
| | * fix tests relying on implicit orderingJeremy Kemper2008-08-261-2/+3
| | |
| | * PostgreSQL: pg driver expects nil instead of empty string for missing user/passJeremy Kemper2008-08-261-2/+2
| | |
| | * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-08-261-1/+1
| | |\
| | | * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-08-261-1/+1
| | | |\
| | | | * use double quotesChad Woolley2008-08-261-1/+1
| | | | |
| * | | | Back to fetching all versions in ruby instead of letting SQL do it as it's ↵Tarmo Tänav2008-08-261-5/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | difficult to get all databases to convert the text value to a number with the same SQL Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * / / Create mysql binary_fields table with latin1 character set as with utf8 all ↵Tarmo Tänav2008-08-261-2/+2
| |/ / | | | | | | | | | | | | | | | the limits would have to be divided by 3 to get the expected text types Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * / Include mysql older than 5.1.23 in the 5.1 series in the list of those that ↵Tarmo Tänav2008-08-261-1/+1
| |/ | | | | | | | | | | can't handle NULL defaults Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * um.. yeahJeremy Kemper2008-08-261-2/+2
| |
| * typoJeremy Kemper2008-08-261-2/+2
| |
| * fix another ordering failureJeremy Kemper2008-08-261-1/+1
| |
| * fix tests relying on implicit orderingJeremy Kemper2008-08-251-4/+2
| |
| * add dynamic finder bang version to raise RecordNotFoundJosh Susser2008-08-253-1/+24
| | | | | | | | | | | | [#905 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * refactor dynamic finder name matching into its own classJosh Susser2008-08-254-72/+125
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * ensure tests load sibling Active Support instead of a gemJeremy Kemper2008-08-251-0/+1
| |