mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
50,379 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

5895 Commits

Author SHA1 Message Date
Rafael Mendonça França a42c9528d8 Merge pull request #19296 from Wildebeest/fix-race-ttl 
Skip the `:race_condition_ttl` branch if the option is 0 or nil.
 2015-03-17 17:30:15 -03:00
yuuji.yaginuma dc667fc79d add `DateTime.now` to list of `TimeHelpers#travel_to` stubbing [ci skip] 2015-03-12 21:11:29 +09:00
Matt Wilde 23767c0c41 Skip the `:race_condition_ttl` branch if the option is 0 or nil. This fixes an issue with the redis cache, where this code will sometimes throw an error out of SETEX when passing 0 as the `expires_at`. 2015-03-11 15:14:10 -07:00
Andrew White 34b27701ee Revert "Take DST into account when locating TimeZone from Numeric." 
Reverting this as it's not the implementation that we would like it to be.
This is being used inside of ActiveSUpport::TimeZone[] and it's unaware
of the context in which to find the timezone period so the timezone found
changes depending on whether DST is in effect for the current period.
This means that `'2001-01-01'.in_time_zone(-9)` changes from winter/summer
even though it's the same date that we're trying to convert.

Since finding timezones by numeric offsets is a bit hit and miss we should
introduce a new API for finding them which supplies the date context in
which we want to search and we should probably also deprecate the finding
of timezones via the [] method, though this needs further discussion.

This reverts commit 2cc2fa3633.
 2015-03-09 13:48:55 +00:00
Peter Suschlik f0768eba28 Target Ruby 2.2.1 in gemspecs 
This is a follow-up to #19257
 2015-03-09 09:56:26 +01:00
Islam Wazery 69db8dc468 Doc fixes [ci skip] 2015-03-07 11:43:15 +00:00
Islam Wazery d97b9dde8d Doc fix [ci skip] 2015-03-07 12:47:30 +02:00
Matthew Draper c96cb66351 Merge pull request #19221 from matthewd/random-tests 
Run all our tests in random order
 2015-03-06 23:02:49 +10:30
Robin Dupret f927591611 Remove a duplicated changelog entry [ci skip] 
This entry now lives in the Action View's changelog ; refs 8a3bd089.
 2015-03-06 12:03:51 +01:00
Yves Senn 081a3963ea `number_to_percentage` and `precision: 0` work with `NAN` and `INFINITY`. 
Closes #19227.
 2015-03-06 09:04:51 +01:00
Abdelkader Boudih 1c1bced7b1 Merge pull request #19224 from davydovanton/doc-update-seconds-since-midnight 
[ci skip] Update documentation for Time#seconds_since_midnight
 2015-03-06 03:51:03 +00:00
eileencodes cbac1fdf65 Change *args to arg in CallbackSequence#call 
`CallbackSequence#call` can only ever take one argument. Using `*args`
here produces unnecessary array allocations. Since it only ever takes
one argument we should use `arg` instead of `*args`.
 2015-03-05 18:21:16 -05:00
Anton Davydov 6518358288 [ci skip] Update documentation for Time#seconds_since_midnight 2015-03-06 00:55:27 +03:00
Matthew Draper b5eb0b6cc3 Revert "Leave all our tests as order_dependent! for now" 
This reverts commit 2f52f96988.

Conflicts:
	actionmailer/test/abstract_unit.rb
	actionview/test/abstract_unit.rb
	activemodel/test/cases/helper.rb
	activerecord/test/cases/helper.rb
	activesupport/test/abstract_unit.rb
	railties/test/abstract_unit.rb
 2015-03-06 04:38:54 +10:30
Arthur Nogueira Neves 3c94bdd055 Merge pull request #19180 from sivsushruth/master 
If TZInfo-data is not present in windows, let the user know.
 2015-03-05 08:53:31 -05:00
Robin Dupret d969405acd Some documentation edits [ci skip] 
* Fix a few typos
* Wrap some lines around 80 chars
* Rephrase some statements
 2015-03-05 14:18:09 +01:00
Sushruth Sivaramakrishnan ce46dfea42 Doc fix [ci skip] 2015-03-05 15:38:24 +05:30
Sushruth Sivaramakrishnan 4946fd7852 Doc fix [ci skip] 2015-03-05 14:48:55 +05:30
Sushruth Sivaramakrishnan 38a49f3c1b Doc fix [ci skip] 2015-03-05 14:15:17 +05:30
Sushruth Sivaramakrishnan 8a5475cb5f Doc fix [ci skip] 2015-03-05 11:32:51 +05:30
Sushruth Sivaramakrishnan 929552edba Doc fix [ci skip] 2015-03-05 10:05:34 +05:30
Sushruth Sivaramakrishnan b7e8a109b1 Doc fix [ci skip] 2015-03-05 08:46:46 +05:30
Richard Schneeman 8d6949bee8 Merge pull request #19189 from mraidel/activesupport_cache_fetch_multi_documentation_fix 
fixes documentation for returned hash in cache.fetch_multi
 2015-03-04 13:35:39 -06:00
Michael Raidel dbe61b840a fixes documentation for returned hash in cache.fetch_multi 2015-03-04 20:30:50 +01:00
Yu Haidong d4f2c3adb3 Fix spelling [ci skip] 2015-03-04 21:54:54 +08:00
Sushruth Sivaramakrishnan f81d80a3a4 If TZInfo-data is not present in windows, let the user know. 2015-03-04 06:34:11 +05:30
Yasyf Mohamedali 2cc2fa3633 Take DST into account when locating TimeZone from Numeric. 
When given a specific offset, use the first result found where the
total current offset (including any periodic deviations such as DST)
from UTC is equal.
 2015-03-03 15:16:47 -05:00
Rafael Mendonça França ed6be59624 Merge pull request #19173 from robin850/rbx-build 
Improve the Rubinius build
 2015-03-02 13:48:45 -03:00
David Heinemeier Hansson 521318333e Move Array#without from Grouping to Access concern and add dedicated test (relates to #19157) 2015-03-02 08:46:29 -08:00
Robin Dupret 562b0b2368 Skip the failing tests on Rubinius for now 2015-03-02 17:28:12 +01:00
Arthur Neves 5333393534 Remove not needed .tap 2015-03-02 11:20:47 -05:00
Robin Dupret 6b1ec17526 Wrap inline rescue with or-equal calls 
At the moment, `rescue_from` doesn't work with strings on Rubinius
because of rubinius/rubinius#3272.
 2015-03-02 17:09:44 +01:00
Rafael Mendonça França 2675a57fc3 Do not output in the console 
[Robin Dupret + Rafael Mendonça França]
 2015-03-02 12:04:37 -03:00
Juanito Fatas 7c34548fe0 Use include? instead of in? for Enumerable#without. 
[egilburg]
 2015-03-02 11:32:35 +08:00
Juanito Fatas 90068e3633 Include object inclusion for enumerable test. 2015-03-02 11:17:55 +08:00
Todd Bealmear c7a37c10ad Add Enumerable#without 2015-03-01 18:45:45 -08:00
Yves Senn daa455f5ca Merge pull request #19131 from tgxworld/reduce_allocated_memory_in_module_delegate 
Reduce allocated memory for Module#delegate.
 2015-02-28 19:26:36 +01:00
Anton Davydov 92dce324b9 [ci skip] Add code examples for Module#anonymous? documentation 2015-02-28 20:58:23 +03:00
Guo Xiang Tan 1bc27a7e61 Reduce allocated memory for Module#delegate. 2015-03-01 01:31:48 +08:00
Anton Davydov 032d279268 [ci skip] Update documentation for Range#to_formatted_s 2015-02-28 19:38:41 +03:00
Anton Davydov dde6ee9e9b [skip ci] Add documentation for String#is_utf8? method 2015-02-28 16:28:54 +03:00
Yves Senn b58dac811b Merge pull request #19121 from davydovanton/update-doc-for-remove 
Update documentation examples for String#remove [skip ci]
 2015-02-28 12:18:41 +01:00
Anton Davydov 8005ad3233 Update documentation examples for String#remove [skip ci] 2015-02-28 13:41:52 +03:00
Rafael Mendonça França 2abed7af6e Merge pull request #19076 from nygrenh/truncate-words-fix 
Fix a backtracking problem in String#truncate_words
 2015-02-25 12:12:31 -03:00
Henrik Nygren ece0d25c2b Fix a backtracking problem in String#truncate_words 
Fixes #19070.
 2015-02-25 17:02:22 +02:00
Rafael Mendonça França 68a2a67116 Merge pull request #18948 from kaspth/automatic-collection-caching 
Merge multi_fetch_fragments.
 2015-02-25 11:54:07 -03:00
Yves Senn e71f5dad4e some indenting and punctuation fixes. [ci skip] 2015-02-23 16:54:40 +01:00
Kasper Timm Hansen ca6aba7f30 Instrument read_multi. 
Adds `read_multi` instrumentation formatted as:

Caches multi read:
- views/david/2/4184ab71db6849621a4d8820fcd2c0ad
- views/david/2/4184ab71db6849621a4d8820fcd2c0ad
- views/david/3/4184ab71db6849621a4d8820fcd2c0ad
- views/david/3/4184ab71db6849621a4d8820fcd2c0ad
 2015-02-21 16:06:57 +01:00
Akira Matsuda 2dff9d0f3e s/around_filter/around_action/ 2015-02-21 06:16:48 +09:00
Vijay Dev 95546d4935 Merge branch 'master' of github.com:rails/docrails 2015-02-14 15:35:47 +00:00