| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #5406 from parndt/fix_issue_5193_in_master | José Valim | 2012-03-13 | 1 | -0/+5 |
| |\ | | | | | Fix issue #5193 in master | ||||
| | * | Fixed problem when fixture_path is not always defined (incidentally, only ↵ | Philip Arndt | 2012-03-13 | 1 | -1/+3 |
| | | | | | | | | | when ActiveRecord is according to test_help.rb). | ||||
| | * | Fixes issue #5193 using the instructions provided in the issue. | Philip Arndt | 2012-03-13 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #5407 from homakov/patch-1 | Santiago Pastorino | 2012-03-13 | 1 | -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 Homakov | 2012-03-13 | 1 | -2/+2 |
| |/ | |||||
| * | Merge pull request #5404 from MarkMT/master | José Valim | 2012-03-13 | 1 | -2/+6 |
| |\ | | | | | Updated description of #retrieve_collector_from_mimes | ||||
| | * | Updated description of #retrieve_collector_from_mimes | Mark Thomson | 2012-03-13 | 1 | -2/+6 |
| |/ | |||||
| * | use AS::Logger so we are consistent | Aaron Patterson | 2012-03-12 | 1 | -1/+1 |
| | | |||||
| * | allow people to specify custom formatters, use the default formatter in ↵ | Aaron Patterson | 2012-03-12 | 4 | -4/+10 |
| | | | | | production so that PID and timestamp are logged. fixes #5388 | ||||
| * | Remove unused method | Santiago Pastorino | 2012-03-12 | 1 | -4/+0 |
| | | |||||
| * | Merge pull request #5294 from robinroestenburg/master | Aaron Patterson | 2012-03-12 | 3 | -26/+53 |
| |\ | | | | | Refactoring of `arel_attributes_values` method | ||||
| | * | Removed flag attributes. | Robin Roestenburg | 2012-03-06 | 3 | -22/+35 |
| | | | |||||
| | * | Refactored method arel_attributes_values. | Robin Roestenburg | 2012-03-06 | 1 | -20/+34 |
| | | | |||||
| * | | make sure connections returned after close are marked as in_use | Aaron Patterson | 2012-03-12 | 2 | -4/+27 |
| | | | |||||
| * | | make the tagged formatter extend the existing formatter | Aaron Patterson | 2012-03-12 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #5394 from erichmenge/master | Aaron Patterson | 2012-03-12 | 2 | -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 Menge | 2012-03-12 | 2 | -0/+5 |
| | | | | |||||
| * | | | Merge pull request #5375 from nertzy/assert_template_with_regexp | Aaron Patterson | 2012-03-12 | 2 | -2/+13 |
| |\ \ \ | | | | | | | | | assert_template matches against Regexp | ||||
| | * | | | assert_template matches against Regexp | Grant Hutchins | 2012-03-10 | 2 | -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_separator | Aaron Patterson | 2012-03-12 | 2 | -1/+5 |
| |\ \ \ \ | | | | | | | | | | | ensure u2029 is escaped in escape_javascript helper | ||||
| | * | | | | ensure u2029 is escaped in escape_javascript helper | benmmurphy | 2012-03-11 | 2 | -1/+5 |
| | | | | | | |||||
| * | | | | | Merge pull request #5393 from jrochkind/clear_to_reap | Aaron Patterson | 2012-03-12 | 1 | -1/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | deprecated clear_stale_active_connections! can call #reap | ||||
| | * | | | | | deprecated clear_stale_active_connections! can call #reap instead of ↵ | Jonathan Rochkind | 2012-03-12 | 1 | -1/+2 |
| |/ / / / / | | | | | | | | | | | | | | | | no-op'ing, #reap does the same thing | ||||
| * | | | | | Add documentation for find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 2 | -0/+5 |
| | | | | | | |||||
| * | | | | | Add dynamic find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 7 | -2/+80 |
| | | | | | | |||||
| * | | | | | Merge pull request #5390 from arunagw/picked_commits | José Valim | 2012-03-12 | 2 | -1/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | fix activerecord query_method regression with offset into Fixnum | ||||
| | * | | | | | fix activerecord query_method regression with offset into Fixnum | Denis Jean | 2012-03-12 | 2 | -1/+5 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | add test to show offset query_methods on mysql & mysql2 change test to cover public API | ||||
| * | | | | | Merge pull request #5387 from panthomakos/autoload | José Valim | 2012-03-12 | 1 | -4/+7 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Improved ActiveSupport::Autoload Performance | ||||
| | * | | | | Improved ActiveSupport::Autoload performance. | Pan Thomakos | 2012-03-11 | 1 | -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_5324 | José Valim | 2012-03-11 | 10 | -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 Arndt | 2012-03-12 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | from text_area helper. | ||||
| | * | | | | Fix unintended removal of 'cols' from a text_area example. | Philip Arndt | 2012-03-12 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fixes #5324 by removing default size options from input:text and default ↵ | Philip Arndt | 2012-03-10 | 9 | -209/+204 |
| | | | | | | | | | | | | | | | | | | | | | cols and rows options from textarea. | ||||
| * | | | | | Merge pull request #5372 from jsl/add_before_send_to_actionmailer | José Valim | 2012-03-11 | 2 | -0/+74 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Add ability to define callbacks in ActionMailer | ||||
| | * | | | | Add ability to define callbacks in ActionMailer using ↵ | Justin S. Leitgeb | 2012-03-11 | 2 | -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_path | José Valim | 2012-03-11 | 2 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | Fix comments about to_partial_path | ||||
| | * | | | | Fix comments about to_partial_path | Grant Hutchins | 2012-03-10 | 2 | -3/+3 |
| | | |/ / | |/| | | |||||
| * | | | | Merge pull request #5326 from lest/patch-2 | Michael Koziarski | 2012-03-10 | 4 | -9/+37 |
| |\ \ \ \ | |/ / / |/| | | | configure how unverified request will be handled | ||||
| | * | | | configure how unverified request will be handled | Sergey Nartimov | 2012-03-09 | 4 | -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 method | Santiago Pastorino | 2012-03-10 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Add missing require | Santiago Pastorino | 2012-03-10 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fix broken tests | Santiago Pastorino | 2012-03-10 | 2 | -1/+4 |
| | | | | | |||||
| * | | | | Merge pull request #5371 from jsl/fix_actionmailer_tests | José Valim | 2012-03-10 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Fix actionmailer tests broken by #4751a69 | ||||
| | * | | | | Fix actionmailer tests broken by #4751a69 | Justin S. Leitgeb | 2012-03-10 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | AbstractController.action_methods should return a Set | Santiago Pastorino | 2012-03-10 | 2 | -3/+4 |
| | | | | | |||||
| * | | | | Merge pull request #5367 from carlosantoniodasilva/middleware-api | Santiago Pastorino | 2012-03-10 | 5 | -24/+67 |
| |\ \ \ \ | |_|/ / |/| | | | Change api_only to http_only and add MiddlewareStackProxy docs | ||||
| | * | | | Change api_only to http_only | Carlos Antonio da Silva | 2012-03-10 | 5 | -21/+20 |
| | | | | | | | | | | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino] | ||||
| | * | | | Add some docs for MiddlewareStackProxy methods and api_only! | Carlos Antonio da Silva | 2012-03-10 | 3 | -5/+49 |
| |/ / / | | | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino] | ||||
| * | | | Merge pull request #5364 from ↵ | José Valim | 2012-03-10 | 2 | -24/+18 |
| |\ \ \ | | | | | | | | | | | | | | | | | carlosantoniodasilva/active-model-serialization-include Active model serialization :include returning string keys | ||||
| | * | | | Rename variable to avoid using name "include" | Carlos Antonio da Silva | 2012-03-09 | 1 | -8/+4 |
| | | | | | | | | | | | | | | | | | Better syntax highlight :) | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |