aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5414 from nashby/select-hidden-inputPiotr Sarnacki2012-03-134-1/+14
|\ | | | | add 'include_hidden' option to select tag, closes #5402
| * add 'include_hidden' option to select tag, closes #5402Vasiliy Ermolovich2012-03-134-1/+14
| |
* | Merge pull request #5416 from kennyj/fix_5399Aaron Patterson2012-03-132-2/+8
|\ \ | |/ |/| Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
| * Fix GH #5399. connection_pools's keys are ↵kennyj2012-03-142-2/+8
|/ | | | ActiveRecord::Base::ConnectionSpecification objects.
* Merge pull request #5397 from rafaelfranca/fix-scaffoldJosé Valim2012-03-134-4/+52
|\ | | | | Do not use the attributes hash in the scaffold functional tests
| * Use the attributes hash explicitlyRafael Mendonça França2012-03-134-12/+44
| |
| * Do not use the attributes hash in the scaffold functional testsRafael Mendonça França2012-03-124-4/+20
| |
* | Actually commit the change!David Heinemeier Hansson2012-03-131-1/+0
| |
* | Undo unwarranted change to coding conventions. I am not a fan of the ↵David Heinemeier Hansson2012-03-131-0/+1
| | | | | | | | 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.
* | Merge pull request #5406 from parndt/fix_issue_5193_in_masterJosé Valim2012-03-131-0/+5
|\ \ | | | | | | Fix issue #5193 in master
| * | Fixed problem when fixture_path is not always defined (incidentally, only ↵Philip Arndt2012-03-131-1/+3
| | | | | | | | | | | | when ActiveRecord is according to test_help.rb).
| * | Fixes issue #5193 using the instructions provided in the issue.Philip Arndt2012-03-131-0/+3
| | |
* | | Merge pull request #5407 from homakov/patch-1Santiago Pastorino2012-03-131-2/+2
|\ \ \ | |/ / |/| | 'module' is reserved word. Sample of code with error - not cool.
| * | 'module' is reserved word. Sample of code with error - not cool.Egor Homakov2012-03-131-2/+2
|/ /
* | Merge pull request #5404 from MarkMT/masterJosé Valim2012-03-131-2/+6
|\ \ | | | | | | Updated description of #retrieve_collector_from_mimes
| * | Updated description of #retrieve_collector_from_mimesMark Thomson2012-03-131-2/+6
|/ /
* | use AS::Logger so we are consistentAaron Patterson2012-03-121-1/+1
| |
* | allow people to specify custom formatters, use the default formatter in ↵Aaron Patterson2012-03-124-4/+10
|/ | | | production so that PID and timestamp are logged. fixes #5388
* Remove unused methodSantiago Pastorino2012-03-121-4/+0
|
* Merge pull request #5294 from robinroestenburg/masterAaron Patterson2012-03-123-26/+53
|\ | | | | Refactoring of `arel_attributes_values` method
| * Removed flag attributes.Robin Roestenburg2012-03-063-22/+35
| |
| * Refactored method arel_attributes_values.Robin Roestenburg2012-03-061-20/+34
| |
* | make sure connections returned after close are marked as in_useAaron Patterson2012-03-122-4/+27
| |
* | make the tagged formatter extend the existing formatterAaron Patterson2012-03-121-2/+2
| |
* | Merge pull request #5394 from erichmenge/masterAaron Patterson2012-03-122-0/+5
|\ \ | | | | | | retrieve_cache_key should work on objects that act like arrays.
| * | Allow retrieve_cache_key to work on collections such as ActiveRecord::Relation.Erich Menge2012-03-122-0/+5
| | |
* | | Merge pull request #5375 from nertzy/assert_template_with_regexpAaron Patterson2012-03-122-2/+13
|\ \ \ | | | | | | | | assert_template matches against Regexp
| * | | assert_template matches against RegexpGrant Hutchins2012-03-102-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_separatorAaron Patterson2012-03-122-1/+5
|\ \ \ \ | | | | | | | | | | ensure u2029 is escaped in escape_javascript helper
| * | | | ensure u2029 is escaped in escape_javascript helperbenmmurphy2012-03-112-1/+5
| | | | |
* | | | | Merge pull request #5393 from jrochkind/clear_to_reapAaron Patterson2012-03-121-1/+2
|\ \ \ \ \ | | | | | | | | | | | | deprecated clear_stale_active_connections! can call #reap
| * | | | | deprecated clear_stale_active_connections! can call #reap instead of ↵Jonathan Rochkind2012-03-121-1/+2
|/ / / / / | | | | | | | | | | | | | | | no-op'ing, #reap does the same thing
* | | | | Add documentation for find_or_create_by_{attribute}! method.Andrew White2012-03-122-0/+5
| | | | |
* | | | | Add dynamic find_or_create_by_{attribute}! method.Andrew White2012-03-127-2/+80
| | | | |
* | | | | Merge pull request #5390 from arunagw/picked_commitsJosé Valim2012-03-122-1/+5
|\ \ \ \ \ | | | | | | | | | | | | fix activerecord query_method regression with offset into Fixnum
| * | | | | fix activerecord query_method regression with offset into FixnumDenis Jean2012-03-122-1/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | add test to show offset query_methods on mysql & mysql2 change test to cover public API
* | | | | Merge pull request #5387 from panthomakos/autoloadJosé Valim2012-03-121-4/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | Improved ActiveSupport::Autoload Performance
| * | | | Improved ActiveSupport::Autoload performance.Pan Thomakos2012-03-111-4/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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).
* | | | Merge pull request #5366 from parndt/fix_issue_5324José Valim2012-03-1110-208/+207
|\ \ \ \ | | | | | | | | | | Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea.
| * | | | Documented the removal of size from text_field based helpers and cols, rows ↵Philip Arndt2012-03-121-0/+4
| | | | | | | | | | | | | | | | | | | | from text_area helper.
| * | | | Fix unintended removal of 'cols' from a text_area example.Philip Arndt2012-03-121-1/+1
| | | | |
| * | | | Fixes #5324 by removing default size options from input:text and default ↵Philip Arndt2012-03-109-209/+204
| | | | | | | | | | | | | | | | | | | | cols and rows options from textarea.
* | | | | Merge pull request #5372 from jsl/add_before_send_to_actionmailerJosé Valim2012-03-112-0/+74
|\ \ \ \ \ | |_|/ / / |/| | | | Add ability to define callbacks in ActionMailer
| * | | | Add ability to define callbacks in ActionMailer using ↵Justin S. Leitgeb2012-03-112-0/+74
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #5373 from nertzy/fix_comments_about_to_partial_pathJosé Valim2012-03-112-3/+3
|\ \ \ \ | | | | | | | | | | Fix comments about to_partial_path
| * | | | Fix comments about to_partial_pathGrant Hutchins2012-03-102-3/+3
| | |/ / | |/| |
* | | | Merge pull request #5326 from lest/patch-2Michael Koziarski2012-03-104-9/+37
|\ \ \ \ | |/ / / |/| | | configure how unverified request will be handled
| * | | configure how unverified request will be handledSergey Nartimov2012-03-094-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can be configured using `:with` option in `protect_from_forgery` method or `request_forgery_protection_method` config option possible values: - :reset_session (default) - :exception new applications are generated with: protect_from_forgery :with => :exception
* | | | @controller already includes url_helpers in with_routing methodSantiago Pastorino2012-03-101-1/+0
| | | |
* | | | Add missing requireSantiago Pastorino2012-03-101-0/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 04:34:35 +0000