3cc6995e71
Merge pull request #2532 from hasclass/as_json__encode_infinite_and_nan_floats_as_null
...
JSON: Encode infinite or NaN floats as `null` to generate valid JSON.
2012-04-30 21:06:22 -07:00
cb5b0cf93f
Merge pull request #6093 from marcandre/observer_public
...
notify_observers should be public
2012-04-30 19:18:10 -07:00
dc74f0cb1b
notify_observers should be public
2012-04-30 22:13:26 -04:00
206b43a954
Merge pull request #6063 from marcandre/observer_extra_args
...
Allow extra arguments for Observers
2012-04-30 16:43:22 -07:00
d7d379967a
remove useless assertions
2012-04-30 16:14:15 -07:00
de6a067078
return value of block is returned
2012-04-30 16:14:15 -07:00
f0182d5cb9
only yield to finder block if something is found
2012-04-30 16:14:15 -07:00
24c068d67d
Allow extra arguments for Observers
2012-04-30 18:10:03 -04:00
838101ae04
Fix PR #6091
...
1. ActiveRecord::Base is not ActiveRecord::Relation
2. The order of records from an SQL query is uncertain without an ORDER clause
3. Run your own tests when submitting a pull request
2012-04-30 22:18:35 +01:00
b7ec8755bc
Merge pull request #5181 from mcmire/issue_3560
...
Handle distance_of_time_in_words boundary conditions. Fixes #3560 .
2012-04-30 12:35:32 -07:00
297359bcfd
distance_of_time_in_words: Add/tweak comments to understand time intervals better
2012-04-30 11:29:36 -06:00
d2f995eda9
distance_of_time_in_words: 45-60 days is about 2 months, not about 1 month
2012-04-30 11:19:49 -06:00
69c2307a7d
Merge pull request #6091 from twinturbo/add-ids
...
Add ActiveRecord::Base#ids - Close #5812
2012-04-30 10:09:26 -07:00
93076168c4
Add ActiveRecord::Base#ids
2012-04-30 09:45:00 -07:00
c435feb404
Merge pull request #5175 from jasonnoble/rake_notes_directories
...
Custom directories for rake notes
2012-04-30 09:00:48 -07:00
324201d7b9
Remove empty lines.
2012-04-30 09:16:29 -06:00
773123178e
Fixed styling issues brought up by @jeremy
2012-04-30 07:51:23 -06:00
37e4e9b313
Add documentation to command_line.textile explaining how to use additional notes directories
2012-04-30 07:48:36 -06:00
e053b415e7
Add ability to specify custom annotation directories
...
SOURCE_ANNOTATION_DIRECTORIES='dir1,dir2' bundle exec rake notes
Searches app, config, lib, script, test (default)
Also searches dir1, dir2
References: #4536 , #4540
2012-04-30 07:48:36 -06:00
b5472cf7f2
Add test coverage for rake notes
...
Add separate tests to verify directories covered
Add tests to verify file_types
2012-04-30 07:48:35 -06:00
7d5146efad
Merge pull request #5705 from lest/patch-3
...
split CDATA end token in cdata_section helper
2012-04-30 06:47:07 -07:00
bca9a9e926
Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores
...
Support cookie jar options for all cookie stores
2012-04-30 06:28:22 -07:00
09de707f25
Merge pull request #6082 from brainopia/smarter_cookie_jar
...
Stream cookies only if needed
2012-04-30 06:27:01 -07:00
6be5999c7d
Merge pull request #6083 from brainopia/remove_unused_closed_ivars
...
Remove a couple of unused ivars left from previous refactoring
2012-04-30 06:19:37 -07:00
16df67b148
split CDATA end token in cdata_section helper
2012-04-30 16:08:06 +03:00
02741121be
Merge pull request #3726 from JanDupal/fix-date-helper-hidden
...
fix Helpers::DateHelper with :use_hidden - hide separators
2012-04-30 06:05:08 -07:00
2d18dd3471
Dont stream back cookie value if it was set to the same value
2012-04-30 17:04:17 +04:00
ff2667d21a
Dont set cookie header for deletion of unexisting data
2012-04-30 17:04:17 +04:00
dbe5162496
Simplify matching with array of possible domains
2012-04-30 17:04:16 +04:00
312ee86373
Use more appropriate one-liner for class declaration
2012-04-30 17:04:16 +04:00
63c00ba558
Merge pull request #5838 from IamNaN/patch-1
...
Incorporating Pacific Island zone changes circa Dec 31 2011
2012-04-30 05:49:03 -07:00
8196a8dd83
Merge pull request #6080 from carlosantoniodasilva/as-changelog-update
...
Improve changelog of new :silence deprecation behavior
2012-04-30 05:12:47 -07:00
01414424b1
Improve changelog of new :silence deprecation behavior
2012-04-30 09:11:11 -03:00
0501a07c5e
Merge pull request #6079 from arunagw/build_fix_master_observing_test
...
build fix for observing_test.rb
2012-04-30 03:04:22 -07:00
7f248076a3
build fix for observing_test.rb
...
introduced here 17c990b153
2012-04-30 15:27:18 +05:30
81f6d7f2ad
Merge pull request #6077 from dmitriy-kiriyenko/improve_signature_of_time_in_words_helper
...
Replace boolean argument with an options hash.
2012-04-30 00:38:57 -07:00
64a54c3f9e
Merge pull request #5530 from malclocke/add_option_to_skip_index.html_on_rails_generate
...
Added a generator option to skip the public/index.html file
2012-04-30 00:26:45 -07:00
4a2d53a514
Replace boolean argument with an options hash.
...
This replaces `include_seconds` argument with an option key
`include_seconds => true` in options hash.
Also `time_ago_in_words` now passes options hash, including a `locale`
key, which makes in compatible with `distance_of_time_in_words`.
2012-04-30 10:26:11 +03:00
aa89bf78a2
Merge pull request #6078 from lest/patch-4
...
allow send_file/send_data to skip disposition header, closes #2973
2012-04-30 00:21:54 -07:00
c9cbc179e8
Update activesupport/CHANGELOG.md
2012-04-30 10:17:01 +03:00
e2b97092e4
Failing test for #6034
2012-04-30 00:16:34 -07:00
88b5f943e6
Merge pull request #6034 from willbryant/flash_must_not_load_session_on_every_request_master
...
Fix the Flash middleware loading the session on every request
2012-04-30 00:16:10 -07:00
4cff1a2809
Merge pull request #6072 from marcandre/observer_simplify_test
...
Observer: simplify tests
2012-04-30 00:15:51 -07:00
cbb264e9fa
no need to dup options in send_data
...
options aren't modified inside send_file_headers!
2012-04-30 10:15:41 +03:00
66c5ac3be9
Merge pull request #5177 from cap10morgan/fix-gh-issue-4374
...
fix inflector bug where -ice gets singularized into -ouse
2012-04-30 00:13:40 -07:00
9f64f20b8b
allow send_file/send_data to skip disposition header, closes #2973
2012-04-30 10:12:55 +03:00
976b1709ba
Merge pull request #6076 from arunagw/build_fix_observed_classes
...
Build fix for observed_classes
2012-04-30 00:01:03 -07:00
2162d16edc
Merge pull request #6032 from lest/patch-2
...
wrap translate defaults to use translate helper features
2012-04-30 00:00:17 -07:00
c9f528defa
wrap translate defaults to use translate helper features, closes #1102
2012-04-30 09:44:39 +03:00
24f143789a
Add note about using 303 See Other for XHR requests other than GET/POST
...
IE since version 6 and recently Chrome and Firefox have started following
302 redirects from XHR requests other than GET/POST using the original request
method. This can lead to DELETE requests being redirected amongst other things.
Although it doesn't directly affect the Rails framework since it doesn't return
a 302 redirect to any non-GET/POST request a note has been added to raise
awareness of the issue. Some references:
Original article from @technoweenie:
http://techno-weenie.net/2011/8/19/ie9-deletes-stuff/
Hacker News discussion of the article:
http://news.ycombinator.com/item?id=2903493
WebKit bug report:
https://bugs.webkit.org/show_bug.cgi?id=46183
Firefox bug report and changeset:
https://bugzilla.mozilla.org/show_bug.cgi?id=598304
https://hg.mozilla.org/mozilla-central/rev/9525d7e2d20d
Chrome bug report:
http://code.google.com/p/chromium/issues/detail?id=56373
HTTPbis bug report and changeset:
http://trac.tools.ietf.org/wg/httpbis/trac/ticket/160
http://trac.tools.ietf.org/wg/httpbis/trac/changeset/1428
Roy T. Fielding's history of the issue:
http://ftp.ics.uci.edu/pub/ietf/http/hypermail/1997q3/0611.html
Automated browser tests for the issue:
http://www.mnot.net/javascript/xmlhttprequest/
Fixes #4144
2012-04-30 06:37:19 +01:00
Piotr Sarnacki