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
Jonathan Rochkind
27ebb3dc8c
deprecated clear_stale_active_connections! can call #reap instead of no-op'ing, #reap does the same thing
2012-03-12 11:14:22 -04:00
Andrew White
ca99beb4a9
Add documentation for find_or_create_by_{attribute}! method.
2012-03-12 15:02:18 +00:00
Andrew White
eee32af45e
Add dynamic find_or_create_by_{attribute}! method.
2012-03-12 14:16:19 +00:00
José Valim
1e2de2cb74
Merge pull request #5390 from arunagw/picked_commits
...
fix activerecord query_method regression with offset into Fixnum
2012-03-12 05:16:19 -07:00
Denis Jean
a2c2f40661
fix activerecord query_method regression with offset into Fixnum
...
add test to show offset query_methods on mysql & mysql2
change test to cover public API
2012-03-12 17:44:10 +05:30
Avi Tzurel
78954acde7
Merge remote-tracking branch 'original_repo/master'
2012-03-12 12:03:57 +02:00
José Valim
0533ee45a7
Merge pull request #5387 from panthomakos/autoload
...
Improved ActiveSupport::Autoload Performance
2012-03-12 01:16:19 -07:00
Pan Thomakos
6b480d2e82
Improved ActiveSupport::Autoload performance.
...
`ActiveSupport::Autoload#autoload` performance is improved in the default
case where a path is present. Since the full path name is not generated, it
isn't necessary to determine the full constant name either. This results in a
3x performance gain and reduces the number of Ruby objects generated. For a full
benchmark check [this gist](https://gist.github.com/2020228 ).
2012-03-11 23:26:48 -07:00
Ryan Bigg
36bd5c9742
Add engines guide to documents.yaml
2012-03-11 16:20:11 -07:00
Ryan Bigg
507df096f4
[instrumentation] Add further action placeholders
2012-03-11 16:19:09 -07:00
Ryan Bigg
a42eedb3a3
[instrumentation guide] Cover deliver.action_mailer event
2012-03-11 16:19:09 -07:00
Ryan Bigg
4daef7427b
[instrumentation guide] Cover receive.action_mailer event
2012-03-11 16:19:09 -07:00
José Valim
6c0d5a19a4
Merge pull request #5366 from parndt/fix_issue_5324
...
Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea.
2012-03-11 15:04:23 -07:00
José Valim
d6ec3f0898
Merge pull request #5372 from jsl/add_before_send_to_actionmailer
...
Add ability to define callbacks in ActionMailer
2012-03-11 14:59:06 -07:00
Philip Arndt
f12f071ece
Documented the removal of size from text_field based helpers and cols, rows from text_area helper.
2012-03-12 10:39:45 +13:00
Philip Arndt
8b5198a417
Fix unintended removal of 'cols' from a text_area example.
2012-03-12 10:33:47 +13:00
Michael de Silva
ddbea9474e
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"
2012-03-11 23:31:37 +03:00
Justin S. Leitgeb
4f28c4fc9a
Add ability to define callbacks in ActionMailer using AbstractController::Callbacks.
...
Prior to this commit, there isn't a good way of adding things like
default inline attachments to an email. This Stack Overflow thread
shows people using hooks like the 'default' method in ActionMailer::Base
to call a Proc for message configuration:
http://stackoverflow.com/questions/5113121/rails-use-same-attachment-for-all-emails-using-layout
This has the unintended side effect of setting a message header, so it's not a good solution.
This pull request adds support for message modifications by including AbstractController:Callbacks
in ActionMailer::Base. It includes tests and documentation for the functionality
provided by including this module.
2012-03-11 14:05:31 -05:00
benmmurphy
c8168a7cdc
ensure u2029 is escaped in escape_javascript helper
2012-03-11 17:28:02 +00:00
Andrew France
625cb12f21
attr_accessor_with_default was deprecated and removed.
...
Deprecated in 673372152032a886ba9196c69348386834590eab and removed in 9cafc28874a681082f9f7e1e445db91f195a25ae.
2012-03-11 13:28:25 +00:00
Avi Tzurel
8de49fe461
Squash commits into a single commit
2012-03-11 12:34:31 +02:00
José Valim
4d2d0d9906
Merge pull request #5373 from nertzy/fix_comments_about_to_partial_path
...
Fix comments about to_partial_path
2012-03-11 01:17:08 -08:00
Mark Thomson
64cd57aba9
Revised explanation of fields_for usage.
...
Minor tweak to previous comments on form_for and form_helper.rb preamble
2012-03-11 03:15:38 -05:00
Michael de Silva
ce8df43a36
added clarification stating the counter_cache attribute needs to be created on the associate class via a migration
2012-03-11 06:30:06 +03:00
Grant Hutchins
b142bd84d8
assert_template matches against Regexp
...
This allows for more strict template assertions,
while maintaining backward compatibility.
For example, if you use assert_template("foo/bar")
and "foo/bar/baz" was rendered, the test passes.
But if you use assert_template(%r{\Afoo/bar\Z}),
you will catch that a different template was
rendered.
Also, if you passed an unsupported argument to
assert_template() in the past, it would silently
succeed. Now it raises an ArgumentError.
2012-03-10 19:25:12 -05:00
Michael Koziarski
411a826583
Merge pull request #5326 from lest/patch-2
...
configure how unverified request will be handled
2012-03-10 16:16:35 -08:00
Grant Hutchins
e78c5eeba1
Fix comments about to_partial_path
2012-03-10 17:40:27 -05:00