Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Routes may be restricted to lists of HTTP methods instead of a single method ↵ | Brennan Dunn | 2008-08-28 | 4 | -6/+37 |
| | | | | | | | | or :any. [#407 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Accept an array of method symbols for collection/member actions of resources | Brennan Dunn | 2008-08-28 | 2 | -8/+26 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge scoped :joins together instead of overwriting them. May expose scoping ↵ | Andrew White | 2008-08-28 | 4 | -15/+109 |
| | | | | | | | | bugs in your code! [#501 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Refactored AssociationCollection#count for uniformity and Ruby 1.8.7 support. | Ernie Miller | 2008-08-28 | 6 | -36/+49 |
| | | | | | | [#831 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-08-28 | 5 | -5/+33 |
|\ | |||||
| * | Deprecated implicit local assignments when rendering partials | Joshua Peek | 2008-08-28 | 4 | -4/+30 |
| | | |||||
| * | Prevent deprecation warning in the tests | Michael Koziarski | 2008-08-28 | 1 | -1/+3 |
| | | |||||
* | | Reinstate Range#step default argument. | Bradford Folkens | 2008-08-27 | 1 | -2/+2 |
|/ | | | | | | [#595 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Implement count limit/offset support for has_many associations | Tarmo Tänav | 2008-08-27 | 2 | -1/+16 |
| | | | | | | [#348 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Alias included associations if needed when doing a count | Tarmo Tänav | 2008-08-27 | 2 | -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 Lea | 2008-08-27 | 2 | -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 Collins | 2008-08-27 | 3 | -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. Klishin | 2008-08-27 | 2 | -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 Kanis | 2008-08-27 | 1 | -1/+1 |
| | |||||
* | respond_to? passes along splat args to avoid introducing the second arg if ↵ | Jeremy Kemper | 2008-08-27 | 1 | -2/+2 |
| | | | | it was omitted | ||||
* | Add TestUploadFile.content_type= to match Request.UploadedFile | Tim Haines | 2008-08-27 | 2 | -1/+6 |
| | | | | | | [#920 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge commit 'sven/i18n' | Jeremy Kemper | 2008-08-27 | 6 | -41/+14 |
|\ | | | | | | | | | Conflicts: activesupport/lib/active_support.rb | ||||
| * | I18n: remove #populate from Simple backend as well | Marko Seppae | 2008-08-27 | 1 | -7/+0 |
| | | |||||
| * | i18n: fixed failing tests after removing #populate and #store_translations | Marko Seppae | 2008-08-27 | 1 | -12/+7 |
| | | |||||
| * | I18n: removed call to #populate from main library files | Marko Seppae | 2008-08-27 | 3 | -9/+3 |
| | | |||||
| * | I18n: removed #populate and #store_translations from api | Marko Seppae | 2008-08-27 | 2 | -13/+4 |
| | | |||||
* | | Moved Logger extensions into core_ext | Joshua Peek | 2008-08-27 | 3 | -129/+128 |
| | | |||||
* | | Fix Ruby's Time marshaling bug in pre-1.9 versions of Ruby: utc instances ↵ | Luca Guidi | 2008-08-27 | 3 | -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 generator | Michael Koziarski | 2008-08-27 | 1 | -0/+1 |
| | | |||||
* | | Deprecate Rails::SecretKeyGenerator in favor of ActiveSupport::SecureRandom. | Hongli Lai (Phusion | 2008-08-27 | 7 | -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 errors | pivotal | 2008-08-27 | 3 | -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 Peek | 2008-08-26 | 3 | -21/+17 |
| | | | | ActionView::Base#helpers | ||||
* | defined? has no bounds | Joshua Peek | 2008-08-26 | 1 | -1/+1 |
| | |||||
* | Require missing libraries and check for defined ActionController constant so ↵ | Joshua Peek | 2008-08-26 | 6 | -4/+30 |
| | | | | ActionView can be used standalone | ||||
* | Performance: reduce garbage created by ↵ | Joshua Peek | 2008-08-26 | 1 | -1/+8 |
| | | | | ActiveRecord::Calculations#column_alias_for | ||||
* | Cache JavaScriptGenerator's helper module set on the template | Joshua Peek | 2008-08-26 | 4 | -16/+20 |
| | |||||
* | The 'rails' command was broken by the last commit. Fix that. | Hongli Lai (Phusion | 2008-08-26 | 3 | -3/+11 |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | When an unexpected exception is caught, tell the administrator to read the ↵ | Hongli Lai (Phusion | 2008-08-26 | 2 | -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 test | Tarmo Tänav | 2008-08-26 | 1 | -3/+3 |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Print the queries that were executed if assert_queries fails | Tarmo Tänav | 2008-08-26 | 1 | -1/+1 |
| | |||||
* | Be more careful | Michael Koziarski | 2008-08-26 | 1 | -1/+0 |
| | |||||
* | Re enable CI for postgresql | Michael Koziarski | 2008-08-26 | 1 | -7/+7 |
| | |||||
* | Just look at sql_type when testing that the correct database-specific type ↵ | Tarmo Tänav | 2008-08-26 | 1 | -4/+1 |
| | | | | | | was used Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-08-26 | 4 | -7/+8 |
|\ | |||||
| * | Include people and readers fixtures to fix test isolation error | Jeremy Kemper | 2008-08-26 | 1 | -2/+2 |
| | | |||||
| * | fix tests relying on implicit ordering | Jeremy Kemper | 2008-08-26 | 1 | -2/+3 |
| | | |||||
| * | PostgreSQL: pg driver expects nil instead of empty string for missing user/pass | Jeremy Kemper | 2008-08-26 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-08-26 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-08-26 | 1 | -1/+1 |
| | |\ | |||||
| | | * | use double quotes | Chad Woolley | 2008-08-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Back to fetching all versions in ruby instead of letting SQL do it as it's ↵ | Tarmo Tänav | 2008-08-26 | 1 | -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änav | 2008-08-26 | 1 | -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änav | 2008-08-26 | 1 | -1/+1 |
|/ | | | | | | can't handle NULL defaults Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | um.. yeah | Jeremy Kemper | 2008-08-26 | 1 | -2/+2 |
| | |||||
* | typo | Jeremy Kemper | 2008-08-26 | 1 | -2/+2 |
| |