Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add default options to file_store to make it align with the other cache ↵ | Michael Koziarski | 2008-04-26 | 1 | -2/+2 |
| | | | | | | stores. [monki] [#40 state:resolved] | ||||
* | Alias Object#instance_variable_names to Object#instance_variables for Ruby 1.8.x | Pratik Naik | 2008-04-21 | 1 | -2/+6 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | gbuesing | 2008-04-20 | 5 | -19/+32 |
|\ | |||||
| * | Ruby 1.8.7 compat: detect and alias non-superclass DateTime#to_s | Jeremy Kemper | 2008-04-20 | 1 | -4/+9 |
| | | |||||
| * | Ruby 1.8.7 compat: override unordered Enumerable#group_by | Jeremy Kemper | 2008-04-20 | 1 | -1/+4 |
| | | |||||
| * | Ruby 1.8.7 compat: String#start_with? and #end_with? | Jeremy Kemper | 2008-04-20 | 3 | -14/+19 |
| | | |||||
* | | Duration #since and #ago with no argument (e.g., 5.days.ago) return ↵ | gbuesing | 2008-04-20 | 2 | -3/+8 |
|/ | | | | TimeWithZone when config.time_zone is set. Introducing Time.current, which returns Time.zone.now if config.time_zone is set, otherwise just returns Time.now | ||||
* | Use append_features instead of included to get the inclusion order right | Jeremy Kemper | 2008-04-20 | 1 | -1/+2 |
| | |||||
* | Merge commit 'rails/master' | Jeremy Kemper | 2008-04-20 | 5 | -31/+53 |
|\ | |||||
| * | Use define_callbacks helper for ActiveRecord validations. | Joshua Peek | 2008-04-20 | 1 | -10/+10 |
| | | |||||
| * | Slight optimization to CallbackChain#union and delete. | Joshua Peek | 2008-04-18 | 1 | -6/+5 |
| | | |||||
| * | Tidy up ActiveSupport::Callbacks::CallbackChain instance API. | Joshua Peek | 2008-04-17 | 1 | -8/+17 |
| | | |||||
| * | Support options passed to ActiveSupport::Cache :mem_cache_store [#14 ↵ | jweiss | 2008-04-17 | 1 | -1/+2 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Time#since behaves correctly when passed a Duration. Closes #11527 [kemiller] | gbuesing | 2008-04-12 | 1 | -5/+8 |
| | | |||||
| * | Add #getutc alias for DateTime#utc | gbuesing | 2008-04-12 | 1 | -0/+1 |
| | | |||||
| * | Refactor TimeWithZone: don't send #since, #ago, #+, #-, #advance through ↵ | gbuesing | 2008-04-12 | 1 | -9/+18 |
| | | | | | | | | method_missing | ||||
* | | Incompatible Symbol#to_proc was reverted upstream | Jeremy Kemper | 2008-04-20 | 1 | -7/+0 |
| | | |||||
* | | Override incompatible 1.8.7p1 String#chars | Jeremy Kemper | 2008-04-19 | 1 | -0/+6 |
| | | |||||
* | | Feature check :force_encoding instead of RUBY_VERSION | Jeremy Kemper | 2008-04-19 | 2 | -2/+2 |
| | | |||||
* | | Override Ruby 1.8.7's incompatible Symbol#to_proc. | Jeremy Kemper | 2008-04-18 | 1 | -1/+8 |
|/ | |||||
* | TimeWithZone respects config.active_support.use_standard_json_time_format | gbuesing | 2008-04-12 | 1 | -1/+5 |
| | |||||
* | Add config.active_support.escape_html_entities_in_json to allow disabling of ↵ | Rick Olson | 2008-04-08 | 3 | -4/+26 |
| | | | | | | html entity escaping. [rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9238 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Improve documentation. | Pratik Naik | 2008-04-05 | 16 | -81/+89 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9226 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Replaced callback method evaluation in AssociationCollection class to use ↵ | Josh Peek | 2008-04-04 | 1 | -17/+11 |
| | | | | | | ActiveSupport::Callbacks. Modified ActiveSupport::Callbacks::Callback#call to accept multiple arguments. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9225 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Time #yesterday and #tomorrow behave correctly crossing DST boundary. Closes ↵ | Geoff Buesing | 2008-04-04 | 1 | -2/+2 |
| | | | | | | #7399 [sblackstone] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9221 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Revert [9209] Use Hash#except | Pratik Naik | 2008-04-02 | 1 | -16/+0 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9210 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Adding Hash#without Closes #7369 [eventualbuddha] | Pratik Naik | 2008-04-02 | 1 | -0/+16 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9209 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | TimeWithZone#method_missing: send to utc to advance with dst correctness, ↵ | Geoff Buesing | 2008-04-02 | 1 | -18/+7 |
| | | | | | | otherwise send to time. Adding tests for time calculations methods git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9208 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Add config.active_support.use_standard_json_time_format setting so that ↵ | Rick Olson | 2008-04-01 | 4 | -3/+17 |
| | | | | | | Times and Dates export to ISO 8601 dates. [rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9203 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Fine, warn. Just don't recurse to death in cc.rb | Jeremy Kemper | 2008-03-31 | 1 | -1/+1 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9161 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Add query methods for superclass_delegating_reader | Jeremy Kemper | 2008-03-31 | 1 | -1/+7 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9156 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Always alias DateTime#to_s to #to_default_s | Jeremy Kemper | 2008-03-31 | 1 | -1/+1 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9155 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | TZInfo: Removing unneeded TimezoneProxy class | Geoff Buesing | 2008-03-30 | 2 | -86/+1 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9153 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | TZInfo: Removing unneeded TimezoneIndexDefinition, since we're not including ↵ | Geoff Buesing | 2008-03-30 | 1 | -72/+0 |
| | | | | | | Indexes::Timezones git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9152 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Bundling abbreviated version of TZInfo gem 0.3.8: only the classes and zone ↵ | Geoff Buesing | 2008-03-30 | 140 | -81/+16012 |
| | | | | | | definitions required to support Rails time zone features are included. If a recent version of the full TZInfo gem is installed, this will take precedence over the bundled version git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9149 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Don't need to explicitly pass the same params to super. Remove trailing ↵ | Jeremy Kemper | 2008-03-30 | 1 | -62/+60 |
| | | | | | | whitespace. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9143 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Ruby 1.9 compat: Suppress Benchmark.realtime method redefined warning. | Josh Peek | 2008-03-30 | 1 | -3/+3 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9142 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Force json string encoding to ASCII-8BIT before unpacking for Ruby 1.9. | Josh Peek | 2008-03-29 | 1 | -2/+4 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9138 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Play nice with 1.9's DateTime#to_s | Jeremy Kemper | 2008-03-29 | 1 | -1/+2 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9137 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | config.time_zone and TimeWithZone#marshal_load accept tzinfo/Olson identifiers | Geoff Buesing | 2008-03-28 | 1 | -1/+1 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9108 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Time.zone= accepts TZInfo::Timezone instances and Olson identifiers; wraps ↵ | Geoff Buesing | 2008-03-28 | 2 | -4/+16 |
| | | | | | | result in TimeZone instance git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9107 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | TimeWithZone time conversions don't need to be wrapped in TimeOrDateTime, ↵ | Geoff Buesing | 2008-03-28 | 1 | -12/+2 |
| | | | | | | because TZInfo does this internally git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9106 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | TimeWithZone#usec returns 0 instead of error when DateTime is wrapped | Geoff Buesing | 2008-03-28 | 1 | -1/+5 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9105 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Improve documentation. | Pratik Naik | 2008-03-26 | 31 | -116/+352 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9093 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Standardise the implementation of the extensions to BigDecimal. Closes ↵ | Michael Koziarski | 2008-03-26 | 2 | -23/+39 |
| | | | | | | #10608 [mikong] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9091 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Ensure that TimeWithZone#to_yaml works when passed a YAML::Emitter. [rick] | Rick Olson | 2008-03-23 | 1 | -1/+5 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9081 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Ensure correct TimeWithZone#to_date | Geoff Buesing | 2008-03-22 | 1 | -1/+1 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9079 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Make TimeWithZone work with tzinfo 0.2.x: use ↵ | Geoff Buesing | 2008-03-21 | 2 | -2/+3 |
| | | | | | | TZInfo::Timezone#zone_identifier alias for #abbreviation, silence warnings on tests. Raise LoadError when TZInfo version is < 0.2 by sniffing for TZInfo::TimeOrDateTime constant. Move all tzinfo-dependent TimeZone tests into uses_tzinfo block git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9071 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Refactor filters to use Active Support callbacks. Closes #11235. | Jeremy Kemper | 2008-03-18 | 1 | -18/+77 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9055 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Time, DateTime and TimeWithZone #in_time_zone defaults to Time.zone. ↵ | Geoff Buesing | 2008-03-17 | 2 | -26/+18 |
| | | | | | | Removing now unneeded #in_current_time_zone. ActiveRecord time zone aware attributes updated to use #in_time_zone git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9047 5ecf4fe2-1ee6-0310-87b1-e25e094e27de |