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

28876 Commits

Author SHA1 Message Date
José Valim adafefb51d Remove ARes from the list. 2012-03-14 00:00:34 +01:00
José Valim 2d3550c4be Merge pull request #5415 from rafaelfranca/refactor 
Refactor the test_unit scaffold generator to use the key_value method
 2012-03-13 14:20:43 -07:00
José Valim ae67a63fe9 Merge pull request #572 from sikachu/remove_activeresource 
Remove Active Resource source files from the repository.
 2012-03-13 14:04:03 -07:00
Piotr Sarnacki 663b66fd53 Merge pull request #5420 from lest/patch-2 
add include_hidden option to checkbox tag
 2012-03-13 13:36:59 -07:00
Piotr Sarnacki 919db1bbbb Check for existence of exactly the called `fixture_path=` method 2012-03-13 21:28:34 +01:00
Sergey Nartimov 9fbb1767b5 add include_hidden option to checkbox tag 2012-03-13 23:17:49 +03:00
Piotr Sarnacki 52bfb48745 Environment in engines tests is required on boot_rails, no need to require explicitly 2012-03-13 21:01:45 +01:00
Piotr Sarnacki 5e754a0a98 Don't need to share engine's tests anymore, plugins are gone 2012-03-13 21:01:44 +01:00
Piotr Sarnacki 24e00e1eb7 Ensure that engine can be mounted at root (#4314) 
It's already fixed and the fix was actually in journey library,
but with #4314 it reappeared second time, so probably this
kind of integration test will be good to have to not allow it to
sneak in after changes in journey or rails itself.
 2012-03-13 21:01:44 +01:00
Prem Sichanugrist f1637bf2bb Remove Active Resource source files from the repository 
Dear Active Resource,

It's not that I hate you or anything, but you didn't get much attention lately. There're so many alternatives out there, and I think people have made their choice to use them than you. I think it's time for you to have a big rest, peacefully in this Git repository.

I will miss you,

@sikachu.
 2012-03-13 14:55:44 -04:00
José Valim a85714a673 Merge pull request #5419 from nashby/patch-1 
fix typo in AP CHANGELOG [ci skip]
 2012-03-13 11:29:21 -07:00
Vasiliy Ermolovich 2731ffae74 fix typo in AP CHANGELOG [ci skip] 2012-03-13 21:24:41 +03:00
Vijay Dev 800c70a8f9 Merge branch 'master' of github.com:lifo/docrails 2012-03-13 23:29:30 +05:30
Alexey Vakhov a9f688648c Fix AM Guide 
Use proc as default argument to recaculate recipients array every time
 2012-03-13 21:57:42 +04:00
Vijay Dev 6d0cc770ce mark engines guide as wip [ci skip] 2012-03-13 23:24:11 +05:30
Piotr Sarnacki cb7d19b66b Merge pull request #5414 from nashby/select-hidden-input 
add 'include_hidden' option to select tag, closes #5402
 2012-03-13 10:51:46 -07:00
Vijay Dev 97b40e1e78 Revert "Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; an elucidated explanation has been provided and ActiveModel en-locale updated to present a less confusing attribute name for 'password_digest' in form errors due to "has_secure_password"" 
This reverts commit ddbea9474e.

Reason: Includes non-doc changes.
 2012-03-13 23:21:46 +05:30
Vijay Dev 25cbe00fbc copy-edit contributing guide [ci skip] 2012-03-13 23:21:41 +05:30
Aaron Patterson dbdbe961cd Merge pull request #5416 from kennyj/fix_5399 
Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
 2012-03-13 10:27:47 -07:00
Rafael Mendonça França 7c00cde79f Refactor the test_unit scaffold generator to use the key_value method 2012-03-13 14:19:03 -03:00
kennyj fdb8805cdd Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects. 2012-03-14 02:11:40 +09:00
Vasiliy Ermolovich 54a75e1a0f add 'include_hidden' option to select tag, closes #5402 2012-03-13 20:00:50 +03:00
José Valim 21b69b233b Merge pull request #5397 from rafaelfranca/fix-scaffold 
Do not use the attributes hash in the scaffold functional tests
 2012-03-13 07:38:23 -07:00
Rafael Mendonça França 08db3d5af3 Use the attributes hash explicitly 2012-03-13 11:21:29 -03:00
David Heinemeier Hansson e7d55f734a Actually commit the change! 2012-03-13 10:00:15 -04:00
David Heinemeier Hansson 46313151bd Undo unwarranted change to coding conventions. I am not a fan of the aesthetics of private/public at the root but more importantly, we should not be changing coding conventions with almost a decades worth of history at a whim. The conventions are there to have a consistent coding style, that is their primary purpose. When there is so much existing code with the existing style, any change will have to lift an enormous burden of proof as to why its overwhelmingly superior. That is not the case here, so this is being reverted. 2012-03-13 09:57:51 -04:00
José Valim fc3e9b32fd Merge pull request #5406 from parndt/fix_issue_5193_in_master 
Fix issue #5193 in master
 2012-03-13 05:24:03 -07:00
Santiago Pastorino 0e502e08f3 Merge pull request #5407 from homakov/patch-1 
'module' is reserved word. Sample of code with error - not cool.
 2012-03-13 05:09:04 -07:00
Egor Homakov 829e379700 'module' is reserved word. Sample of code with error - not cool. 2012-03-13 15:13:05 +04:00
Philip Arndt f0ee9e6889 Fixed problem when fixture_path is not always defined (incidentally, only when ActiveRecord is according to test_help.rb). 2012-03-13 23:28:42 +13:00
Philip Arndt 5088f8ce06 Fixes issue #5193 using the instructions provided in the issue. 2012-03-13 23:27:50 +13:00
José Valim ce72c0c784 Merge pull request #5404 from MarkMT/master 
Updated description of #retrieve_collector_from_mimes
 2012-03-13 01:42:51 -07:00
Mark Thomson bc8b55c5c3 Merge remote-tracking branch 'origin/master' 2012-03-13 02:37:53 -05:00
Mark Thomson 4cb71eaf46 Added documentation for the ActionController::MimeResponds::Collector class. 2012-03-13 02:36:59 -05:00
Mark Thomson fb094acc56 Updated description of #retrieve_collector_from_mimes 2012-03-13 02:16:38 -05:00
Ryan Bigg 30b2dd431e [config guide] Add mass_assignment_sanitizer to Active Record config options 2012-03-12 16:01:57 -07:00
Rafael Mendonça França 7ad4c7c881 Do not use the attributes hash in the scaffold functional tests 2012-03-12 19:45:01 -03:00
Aaron Patterson 10e1ce4fb9 use AS::Logger so we are consistent 2012-03-12 14:27:28 -07:00
Aaron Patterson 51aeae91ac allow people to specify custom formatters, use the default formatter in production so that PID and timestamp are logged. fixes #5388 2012-03-12 14:25:41 -07:00
Filipe Moreira 6c93fbc516 Advise to keep secret token private 2012-03-12 21:19:58 +01:00
Filipe Moreira 0b36ad7066 Advise to keep secret token private 2012-03-12 21:13:17 +01:00
Santiago Pastorino 2ad34f46a1 Remove unused method 2012-03-12 16:09:40 -03:00
Aaron Patterson 0bb6fcb1d1 Merge pull request #5294 from robinroestenburg/master 
Refactoring of `arel_attributes_values` method
 2012-03-12 12:02:52 -07:00
Aaron Patterson 0210c44cd3 make sure connections returned after close are marked as in_use 2012-03-12 11:51:28 -07:00
Aaron Patterson 7f40b9cd42 make the tagged formatter extend the existing formatter 2012-03-12 11:34:02 -07:00
Aaron Patterson 0f5b32cd08 Merge pull request #5394 from erichmenge/master 
retrieve_cache_key should work on objects that act like arrays.
 2012-03-12 10:33:50 -07:00
Erich Menge be623677a3 Allow retrieve_cache_key to work on collections such as ActiveRecord::Relation. 2012-03-12 12:29:30 -05:00
Aaron Patterson fd22471313 Merge pull request #5375 from nertzy/assert_template_with_regexp 
assert_template matches against Regexp
 2012-03-12 10:13:16 -07:00
Aaron Patterson dea486d00e Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_separator 
ensure u2029 is escaped in escape_javascript helper
 2012-03-12 10:09:34 -07:00
Aaron Patterson 2b0558585f Merge pull request #5393 from jrochkind/clear_to_reap 
deprecated clear_stale_active_connections! can call #reap
 2012-03-12 09:45:33 -07:00