Commit Graph

4556 Commits

Author SHA1 Message Date
Carlos Antonio da Silva
9126d53a07 Enforce i18n version >= v0.6.4
Keep in sync with 3-2-stable.
2013-02-27 21:08:27 -03:00
Steve Klabnik
5112a6ccdf Move AS CHANGELOG entry up.
I merged b883706 but forgot to move the entry past beta1.
2013-02-26 11:21:37 -08:00
Steve Klabnik
95883ca4b1 Merge pull request #9329 from chuckbjones/fix-cache-delete-rc
Fix deletion of empty directories
2013-02-26 11:15:29 -08:00
Santiago Pastorino
2fa9c8881f We want i18n >= 0.6.2 but < 1.0 2013-02-26 16:14:00 -02:00
Rafael Mendonça França
0f75e2c51f Update CHANGELOGS 2013-02-26 13:45:57 -03:00
Vijay Dev
7184e3e02e Merge branch 'master' of github.com:lifo/docrails 2013-02-26 21:53:38 +05:30
Charles Jones
b8837066dc Fix deletion of empty directories:
1. When comparing the directory to delete against the top level
   cache_path, use File.realpath to make sure we aren't comparing two
   unequal strings that point to the same path. This occurs, for
   example, when cache_path has a trailing slash, which it does in the
   default Rails configuration. Since the input to
   delete_empty_directories never has a trailing slash, the comparison
   will never be true and the top level cache directory (and above) may
   be deleted. However…

2. File.delete raises EPERM when trying to delete a directory, so no
   directories have ever been deleted. Changing the code to Dir.delete
   fixes that.
2013-02-25 18:54:44 -06:00
Guillermo Iguaran
80f7975e43 Bump i18n version to 0.6.2 2013-02-25 18:03:27 -05:00
David Heinemeier Hansson
c0bc9ce38c Preparing for 4.0.0.beta1 release 2013-02-25 08:31:50 -06:00
Chris Baynes
fa891a2b9d Keep second fraction when DateTime#change is called. 2013-02-25 11:05:49 +01:00
Guillermo Iguaran
3762ee0baa Revert "Simplify code in AS json encoder"
This reverts commit 046e27a7338f2961c10e9d133e0e2229b51c2ba8.
Check https://github.com/rails/rails/pull/8815#issuecomment-14026122 for
details.
2013-02-25 00:21:45 -05:00
Steve Klabnik
15d693df93 Merge pull request #8815 from bogdan/simplified-to-json-args
AS JSON encoder: remove monkey patch of Array
2013-02-24 20:29:26 -08:00
Rafael Mendonça França
51e963790f Add more information to the CHANGELOG entry [ci skip] 2013-02-24 18:36:45 -03:00
stopdropandrew
cb100ca02b Added ActiveSupport::TimeWithZone#to_r for Time#at compatibility. 2013-02-24 13:24:50 -08:00
Xavier Noria
1509844cdd did a pass over the AS changelog [ci skip] 2013-02-24 21:26:02 +01:00
Xavier Noria
a628dd5ac4 Revert "prevent minitest from printing a --seed run option"
Reason: on a second thought, minitest prints a seed as run option
regardless of the test order, and it actually calls srand, so
albeit it might be misleading I believe, it is the way it is and
should be left that way.

This reverts commit c15862ae0cb876d745609170f0f90a9bb9b5e0ae.
2013-02-24 01:22:45 +01:00
Xavier Noria
c15862ae0c prevent minitest from printing a --seed run option
See the first FIXME comment in the patch for the rationale.
2013-02-24 01:12:49 +01:00
Carlos Antonio da Silva
38f347a825 Move number_to_human test from AP to AS
Since all changes from #9347 are related to AS, it seems proper that the
test is placed there as well.
2013-02-22 19:44:50 -03:00
Carlos Antonio da Silva
1fbfdf5e1b Changelog improvements, use 1.9 style hash in examples [ci skip] 2013-02-22 19:44:50 -03:00
Steve Klabnik
4ffcd83dea Merge pull request #9347 from hoffm/number_to_human_bug
Address edge case for number_to_human with units option.
2013-02-22 14:00:24 -08:00
Gert Goet
eb1c5c4ae4 Correct comment for (beginning|end)_of_minute 2013-02-22 20:56:22 +01:00
hoffm
4e3ceedeba Address edge case for number_to_human with units option.
ActiveSupport::NumberHelper#number_to_human now returns the number unaltered when
the units hash does not contain the needed key, e.g. when the number provided is less
than the largest key provided.
2013-02-22 08:25:51 -05:00
Gagan Awhad
6f380d3778 Added beginning_of_minute support to core_ext calculations for Time and DateTime 2013-02-21 16:14:16 -06:00
Xavier Noria
20ed3e0f71 moves the new :nsec date format to the Active Support changelog [ci skip] 2013-02-20 18:08:55 +01:00
Doug Yun
336dae02cd Corrected link anchor and added colons for continuity 2013-02-19 11:11:42 -05:00
Akira Matsuda
18c57c79ef Bump up minitest dependency and remove our own reinvented version of ParallelEach 2013-02-19 00:08:16 +09:00
Vijay Dev
0c145448c4 Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	guides/source/upgrading_ruby_on_rails.md
2013-02-15 22:06:17 +05:30
Ryunosuke SATO
cfd85255d6 Supress warning about method redifinition
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'`.
2013-02-11 02:29:24 +09:00
Carlos Antonio da Silva
a429d9e6f9 Merge pull request #9238 from norman/unicode_62
Update to latest Unicode data.
2013-02-10 07:39:52 -08:00
Andrew White
5aff21829d Merge pull request #8643 from tricknotes/remove-method-redefined-warning
Remove method redefined warning
2013-02-10 07:37:41 -08:00
Ryunosuke SATO
c112721b44 Remove method redefined warning
In `i18n` gem, the method definition of  `Hash#deep_merge!` is skipped
when it is already defined.

- warning: method redefined; discarding old deep_merge!
2013-02-11 00:09:02 +09:00
Norman Clarke
65bf0945ee Update to latest Unicode data.
Release notes at: http://www.unicode.org/versions/Unicode6.2.0/
2013-02-10 12:06:07 -03:00
Beyond
d59a877da4 added compress options for gzip
added test for compress options of gzip

update changelog
2013-02-10 20:01:42 +09:00
Dalibor Nasevic
d47b90e76c Change Class#subclasses doc example 2013-02-06 23:31:02 +01:00
Carlos Antonio da Silva
2f0c26bf59 Update changelog from #9128 with author name
And improve AS changelog a bit [ci skip]
2013-02-06 19:02:40 -02:00
Jeremy Kemper
c7598134a4 Merge pull request #9128 from jamesotron/iso8601-sub-second-accuracy
Modify TimeWithZone#as_json to return 3DP of sub-second accuracy.
2013-02-06 12:33:28 -08:00
Akira Matsuda
9ec14c223b Missing require extract_options 2013-01-31 15:56:47 +09:00
James Harton
28ab79d7c5 Modify TimeWithZone#as_json to return 3DP of sub-second accuracy by default, since it's allowed by the spec and is very useful. 2013-01-31 14:11:51 +13:00
Akira Matsuda + Koichi Sasada
eba172fb76 'minitest/parallel_each' might not always be available 2013-01-29 20:46:09 +09:00
Akira Matsuda + Koichi Sasada
71862cabaa Needs to explicitly require 'minitest/parallel_each'
Minitest has changed to require this since https://github.com/seattlerb/minitest/commit/728054b
2013-01-29 19:48:51 +09:00
Xavier Noria
b4fa6516c1 revamps the RDoc of Object#try 2013-01-28 23:32:22 +01:00
Carlos Antonio da Silva
68f69ec31e Move AS changelog entry to the top, improve AP changelog a bit
[ci skip]
2013-01-28 19:40:18 -02:00
Xavier Noria
3f11253af0 no need for \Z, \z is more concise 2013-01-28 22:27:37 +01:00
Xavier Noria
30034dfbc4 Merge pull request #8830 from antoinelyset/master
Improve String#squish whitespaces matching
2013-01-28 13:24:56 -08:00
Akira Matsuda
5f30b547c8 Use Encoding::UTF_8 constant 🚯 2013-01-28 17:06:02 +09:00
Akira Matsuda
59deaecc76 Use already defined Encoding constants rather than creating one-trip Strings 2013-01-28 15:23:31 +09:00
Xavier Noria
0b5d3f3273 Merge remote-tracking branch 'docrails/master'
Conflicts:
	actionpack/lib/action_view/helpers/form_options_helper.rb
	guides/code/getting_started/app/controllers/comments_controller.rb
2013-01-26 17:41:56 +01:00
Akira Matsuda + Koichi Sasada
b7b27fc2a3 Set Thread.abort_on_exception for the whole AS, AP, and AR tests
this would give us some more clues in case a test silently dies inside Thread
2013-01-24 20:00:45 +09:00
Akira Matsuda
9b0f3faab4 Fix some wrong String extensions tests
* ASCII_STRING was not an ASCII String
* BYTE_STRING was not an in valid UTF-8 String
* added an assertion for non-UTF-8 String
2013-01-23 13:30:55 +09:00
Akira Matsuda
389ae055ae Test String#dasherize 2013-01-23 13:29:40 +09:00