Vijay Dev
42ff22f33a
Merge branch 'master' of github.com:lifo/docrails
2012-05-01 19:06:03 +05:30
Vijay Dev
339602b219
Revert "Added Short 1 line note about connection pools.
"
...
This reverts commit c3954baee92446219606621c1b185360553a6d5d.
2012-05-01 18:55:22 +05:30
Vijay Dev
bb52fb01a4
Merge pull request #95 from RobZolkos/add_doc_for_utc_offset
...
Add documention for utc_offset method
2012-05-01 05:04:00 -07:00
Edward Tsech
6e8f2be51a
Add line which gives a little bit more information how *_will_change! works.
2012-05-01 13:52:21 +02:00
Rob Zolkos
073043ff03
Add documention for utc_offset method
2012-05-01 21:16:56 +10:00
Oscar Del Ben
b8d2fecbf5
Bump Rails version in action mailer guide.
2012-05-01 13:08:10 +03:00
Oscar Del Ben
87ac6a2540
Merge branch 'master' of github.com:lifo/docrails
2012-05-01 10:58:31 +02:00
Oscar Del Ben
2a15598ae8
Getting Started Guide Code Cleanup
2012-05-01 10:58:16 +02:00
Piotr Sarnacki
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
Jeremy Kemper
cb5b0cf93f
Merge pull request #6093 from marcandre/observer_public
...
notify_observers should be public
2012-04-30 19:18:10 -07:00
Marc-Andre Lafortune
dc74f0cb1b
notify_observers should be public
2012-04-30 22:13:26 -04:00
Erich Menge
dda6fa8c9c
Minor English fix.
2012-04-30 20:21:02 -05:00
Aaron Patterson
206b43a954
Merge pull request #6063 from marcandre/observer_extra_args
...
Allow extra arguments for Observers
2012-04-30 16:43:22 -07:00
Aaron Patterson
d7d379967a
remove useless assertions
2012-04-30 16:14:15 -07:00
Aaron Patterson
de6a067078
return value of block is returned
2012-04-30 16:14:15 -07:00
Aaron Patterson
f0182d5cb9
only yield to finder block if something is found
2012-04-30 16:14:15 -07:00
Marc-Andre Lafortune
24c068d67d
Allow extra arguments for Observers
2012-04-30 18:10:03 -04:00
Andrew White
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
Jeremy Kemper
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
Elliot Winkler
297359bcfd
distance_of_time_in_words: Add/tweak comments to understand time intervals better
2012-04-30 11:29:36 -06:00
Elliot Winkler
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
Yehuda Katz
69c2307a7d
Merge pull request #6091 from twinturbo/add-ids
...
Add ActiveRecord::Base#ids - Close #5812
2012-04-30 10:09:26 -07:00
twinturbo
93076168c4
Add ActiveRecord::Base#ids
2012-04-30 09:45:00 -07:00
Jeremy Kemper
c435feb404
Merge pull request #5175 from jasonnoble/rake_notes_directories
...
Custom directories for rake notes
2012-04-30 09:00:48 -07:00
Jason Noble
324201d7b9
Remove empty lines.
2012-04-30 09:16:29 -06:00
Gaurish Sharma
c3954baee9
Added Short 1 line note about connection pools.
...
I hope its okay to add this here. if not, then please revert back.
2012-04-30 19:29:40 +05:30
Jason Noble
773123178e
Fixed styling issues brought up by @jeremy
2012-04-30 07:51:23 -06:00
Jason Noble
37e4e9b313
Add documentation to command_line.textile explaining how to use additional notes directories
2012-04-30 07:48:36 -06:00
Jason Noble & Ralph Shnelvar
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
Jason Noble & Ralph Shnelvar
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
Jeremy Kemper
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
José Valim
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
José Valim
09de707f25
Merge pull request #6082 from brainopia/smarter_cookie_jar
...
Stream cookies only if needed
2012-04-30 06:27:01 -07:00
José Valim
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
Sergey Nartimov
16df67b148
split CDATA end token in cdata_section helper
2012-04-30 16:08:06 +03:00
José Valim
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
brainopia
2d18dd3471
Dont stream back cookie value if it was set to the same value
2012-04-30 17:04:17 +04:00
brainopia
ff2667d21a
Dont set cookie header for deletion of unexisting data
2012-04-30 17:04:17 +04:00
brainopia
dbe5162496
Simplify matching with array of possible domains
2012-04-30 17:04:16 +04:00
brainopia
312ee86373
Use more appropriate one-liner for class declaration
2012-04-30 17:04:16 +04:00
Andrew White
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
Hrvoje Šimić
620cc9af11
add ActiveRecord::RecordInvalid to exceptions
...
sort the exception names alphabetically
2012-04-30 14:46:30 +02:00
Xavier Noria
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
Carlos Antonio da Silva
01414424b1
Improve changelog of new :silence deprecation behavior
2012-04-30 09:11:11 -03:00
José Valim
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
Arun Agrawal
7f248076a3
build fix for observing_test.rb
...
introduced here 17c990b153f8635874c006a7460ee95817543fc1
2012-04-30 15:27:18 +05:30
Oscar Del Ben
4eb482efbc
Merge branch 'master' of github.com:lifo/docrails
2012-04-30 11:28:15 +02:00
Brian Cardarella
14cd5aa8da
Rails 4.0 upgrade note for the ConfirmationValidator change
2012-04-30 03:58:39 -04:00
José Valim
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
José Valim
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