Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Bump up minitest dependency and remove our own reinvented version of ↵ | Akira Matsuda | 2013-02-19 | 1 | -37/+1 | |
| | | | | | | | | ParallelEach | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-02-15 | 1 | -2/+2 | |
|\ \ | | | | | | | | | | | | | Conflicts: guides/source/upgrading_ruby_on_rails.md | |||||
| * | | Change Class#subclasses doc example | Dalibor Nasevic | 2013-02-06 | 1 | -2/+2 | |
| | | | ||||||
* | | | Supress warning about method redifinition | Ryunosuke SATO | 2013-02-11 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In i18n gem, the following methods are defined. - `Hash#except` - `Hash#slice` But if there are defined already, i18n skips these definitions. So these definition by `active_support` are required before `require 'i18n'`. | |||||
* | | | Merge pull request #9238 from norman/unicode_62 | Carlos Antonio da Silva | 2013-02-10 | 2 | -1/+1 | |
|\ \ \ | | | | | | | | | Update to latest Unicode data. | |||||
| * | | | Update to latest Unicode data. | Norman Clarke | 2013-02-10 | 2 | -1/+1 | |
| |/ / | | | | | | | | | | Release notes at: http://www.unicode.org/versions/Unicode6.2.0/ | |||||
* | | | Merge pull request #8643 from tricknotes/remove-method-redefined-warning | Andrew White | 2013-02-10 | 1 | -0/+1 | |
|\ \ \ | | | | | | | | | Remove method redefined warning | |||||
| * | | | Remove method redefined warning | Ryunosuke SATO | 2013-02-11 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `i18n` gem, the method definition of `Hash#deep_merge!` is skipped when it is already defined. - warning: method redefined; discarding old deep_merge! | |||||
* | | | | added compress options for gzip | Beyond | 2013-02-10 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | added test for compress options of gzip update changelog | |||||
* | | | | Merge pull request #9128 from jamesotron/iso8601-sub-second-accuracy | Jeremy Kemper | 2013-02-06 | 1 | -1/+1 | |
|\ \ \ \ | |_|/ / |/| | | | Modify TimeWithZone#as_json to return 3DP of sub-second accuracy. | |||||
| * | | | Modify TimeWithZone#as_json to return 3DP of sub-second accuracy by default, ↵ | James Harton | 2013-01-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | since it's allowed by the spec and is very useful. | |||||
* | | | | Missing require extract_options | Akira Matsuda | 2013-01-31 | 2 | -0/+2 | |
|/ / / | ||||||
* | | | 'minitest/parallel_each' might not always be available | Akira Matsuda + Koichi Sasada | 2013-01-29 | 1 | -1/+4 | |
| | | | ||||||
* | | | Needs to explicitly require 'minitest/parallel_each' | Akira Matsuda + Koichi Sasada | 2013-01-29 | 1 | -0/+2 | |
| | | | | | | | | | | | | Minitest has changed to require this since https://github.com/seattlerb/minitest/commit/728054b | |||||
* | | | revamps the RDoc of Object#try | Xavier Noria | 2013-01-28 | 1 | -22/+30 | |
| | | | ||||||
* | | | no need for \Z, \z is more concise | Xavier Noria | 2013-01-28 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #8830 from antoinelyset/master | Xavier Noria | 2013-01-28 | 1 | -2/+5 | |
|\ \ \ | | | | | | | | | Improve String#squish whitespaces matching | |||||
| * | | | Improve String#squish whitespaces matching | Antoine Lyset | 2013-01-22 | 1 | -2/+5 | |
| | | | | ||||||
* | | | | Use already defined Encoding constants rather than creating one-trip Strings | Akira Matsuda | 2013-01-28 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge remote-tracking branch 'docrails/master' | Xavier Noria | 2013-01-26 | 2 | -2/+2 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb guides/code/getting_started/app/controllers/comments_controller.rb | |||||
| * | | | fix reference to ActiveSupport::ProxyObject | Matt Bridges | 2013-01-13 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Clarified the minute option on DateTime#change | Jakob Waller | 2013-01-10 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Revert "Set the default timezone after the initialization since the ↵ | Carlos Antonio da Silva | 2013-01-22 | 1 | -16/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | configuration" This reverts commit 39374aa925a7d670b039c0c0c9aa9f4aef19466b. | |||||
* | | | | resistance is futile | Xavier Noria | 2013-01-21 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | slices less, reads better | Xavier Noria | 2013-01-21 | 1 | -13/+22 | |
| | | | | ||||||
* | | | | Merge pull request #8671 from xuanxu/fix_irregular | Xavier Noria | 2013-01-21 | 1 | -0/+3 | |
|\ \ \ \ | | | | | | | | | | | Inflector irregular singularize rules | |||||
| * | | | | Inflector irregular singularize rules | Juanjo Bazán | 2013-01-01 | 1 | -0/+3 | |
| | | | | | ||||||
* | | | | | Use `DateTime.parse` inside `String#to_datetime` | Andrew White | 2013-01-21 | 1 | -8/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the standard library's `DateTime.parse` because it's marginally faster and supports partial date/time strings. Benchmark: user system total real old 3.980000 0.000000 3.980000 ( 3.987606) new 3.640000 0.010000 3.650000 ( 3.641342) | |||||
* | | | | | Standardise the return value of `to_time` | Andrew White | 2013-01-21 | 2 | -19/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit standardises the return value of `to_time` to an instance of `Time` in the local system timezone, matching the Ruby core and standard library behavior. The default form for `String#to_time` has been changed from :utc to :local but research seems to suggest the latter is the more common form. Also fix an edge condition with `String#to_time` where the string has a timezone offset in it and the mode is :local. e.g: # Before: >> "2000-01-01 00:00:00 -0500".to_time(:local) => 2000-01-01 05:00:00 -0500 # After: >> "2000-01-01 00:00:00 -0500".to_time(:local) => 2000-01-01 00:00:00 -0500 Closes #2453 | |||||
* | | | | | Remove warning: shadowing outer local variable | Carlos Antonio da Silva | 2013-01-19 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependency | Aaron Patterson | 2013-01-19 | 1 | -3/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove i18n symbol dependency | |||||
| * | | | | | Remove i18n symbol dependency | Chris McGrath | 2013-01-17 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | date.order is the only key in rails i18n that is required to be a symbol. This patch allows for symbols or strings which means: * No requirement for symbol type in .yml files. A future YAML.safe_load wouldn't need to load symbols * Rails could actually use json rather than yml as the backend | |||||
* | | | | | | Refactor ActiveSupport::Cache::Store#fetch. | Joey Butler | 2013-01-19 | 1 | -25/+41 | |
| | | | | | | ||||||
* | | | | | | The test setup is not threadsafe. Wrap in a mutex. | Jon Leighton | 2013-01-18 | 1 | -3/+7 | |
| | | | | | | ||||||
* | | | | | | MiniTest already defines a ParallelEach class | Jon Leighton | 2013-01-18 | 1 | -23/+27 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | This may or may not fix the intermittent railties failures we've been seeing on the CI with Ruby 2.0. We'll see. | |||||
* | | | | | remove_possible_method -> remove_method | Nihad Abbasov | 2013-01-11 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | Date#to_time and Date#xmlschema methods defined in Ruby 1.9.3 | |||||
* | | | | | Updating Array access docs more consistent | Matt Bridges | 2013-01-10 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | extract PerformanceTest into rails-performance_tests gem | Yves Senn | 2013-01-10 | 4 | -672/+0 | |
| | | | | | ||||||
* | | | | | adding missing requires | Aaron Patterson | 2013-01-09 | 1 | -1/+3 | |
| | | | | | ||||||
* | | | | | adding start / finish on the instrumenter, adding tests for the class | Aaron Patterson | 2013-01-09 | 1 | -6/+17 | |
| | | | | | ||||||
* | | | | | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. | Jeremy Kemper | 2013-01-08 | 1 | -4/+23 | |
| | | | | | ||||||
* | | | | | Revert "Merge branch 'master-sec'" | Jeremy Kemper | 2013-01-08 | 1 | -23/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing changes made to f049016cd348627bf8db0d72382d7580bf802a79. | |||||
* | | | | | Merge branch 'master-sec' | Aaron Patterson | 2013-01-08 | 1 | -4/+23 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | * master-sec: CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu | |||||
| * | | | | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. | Jeremy Kemper | 2013-01-08 | 1 | -4/+23 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-01-09 | 7 | -8/+25 | |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Conflicts: guides/source/getting_started.md | |||||
| * | | | | Correct method notation for #acts_like? [ci skip] | Doug Yun | 2013-01-07 | 1 | -4/+4 | |
| | | | | | ||||||
| * | | | | Instance_variable_names are strings. That is the most important information IMO | Akira Matsuda | 2013-01-08 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | prefer american spelling of 'behavior' | Gosha Arinich | 2013-01-07 | 2 | -2/+2 | |
| | | | | | ||||||
| * | | | | `Model.all` alone does nothing | Akira Matsuda | 2013-01-04 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Add documentation for BacktraceCleaner#remove_filters! | Matthew Stopa | 2013-01-02 | 1 | -0/+3 | |
| | | | | |