Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 :) | ||||
| * | | Remove Array#wrap usage in AMo serialization | Carlos Antonio da Silva | 2012-03-09 | 1 | -2/+1 |
| | | | |||||
| * | | Make sure serializable hash with :include always returns string keys | Carlos Antonio da Silva | 2012-03-09 | 2 | -15/+14 |
|/ / | |||||
* | | Install latest bundler on Travis. | José Valim | 2012-03-09 | 1 | -0/+2 |
| | | |||||
* | | Bump bundler dependency. | José Valim | 2012-03-09 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #5356 from carlosantoniodasilva/rake-test-system | José Valim | 2012-03-09 | 4 | -106/+98 |
|\ \ | | | | | | | Use one system call whenever possible, group rake and Dir.chdir calls | ||||
| * | | Use one system call whenever possible, group rake and Dir.chdir calls | Carlos Antonio da Silva | 2012-03-08 | 4 | -106/+98 |
| | | | |||||
* | | | Merge pull request #5352 from avakhov/ar_finder_sql_uniq_ids | José Valim | 2012-03-09 | 2 | -1/+8 |
|\ \ \ | | | | | | | | | In AR depths use &:to_i before :uniq to process mixed arrays likes ["1", 1] correct | ||||
| * | | | In AR depths use &:to_i before :uniq to process mixed arrays likes ["1", 1] ↵ | Alexey Vakhov | 2012-03-09 | 2 | -1/+8 |
|/ / / | | | | | | | | | | correct | ||||
* | | | Merge pull request #5351 from shanna/master | José Valim | 2012-03-08 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Missing active_model/naming.rb dependency. | ||||
| * | | | Added missing ActiveModel::Naming dependency. | Shane Hanna | 2012-03-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | ActiveModel::Name constructor expects to be able to call #blank? on a String but the core Object#blank? extension is never required. | ||||
* | | | | Minor changelog fixes [ci skip] | Vijay Dev | 2012-03-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #5349 from rafaelfranca/changelog-fix | Vijay Dev | 2012-03-08 | 7 | -10/+59 |
|\ \ \ \ | | | | | | | | | | | Fix my name in the CHANGELOG to follow the convention | ||||
| * | | | | Fix my name in the CHANGELOG to follow the convention | Rafael Mendonça França | 2012-03-09 | 7 | -10/+59 |
| |/ / / | | | | | | | | | | | | | Also add missing entries and use the formating convention | ||||
* | | | | Merge pull request #5348 from rafaelfranca/fix-warning | Vijay Dev | 2012-03-08 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Remove warning of unused variable | ||||
| * | | | Remove warning of unused variable | Rafael Mendonça França | 2012-03-08 | 1 | -1/+1 |
|/ / / | |||||
* | | | ensure that released connections move between threads | Aaron Patterson | 2012-03-08 | 1 | -0/+18 |
| | | | |||||
* | | | make active_connection? return true only if there is an open connection in ↵ | Aaron Patterson | 2012-03-08 | 2 | -7/+39 |
|/ / | | | | | | | use for the current thread. fixes #5330 | ||||
* | | fix incorrect changelog headings [ci skip]. | Vijay Dev | 2012-03-09 | 3 | -25/+27 |
| | | | | | | | | Last commit message should not have said 'Rails 4' either | ||||
* | | changelog updates for Rails 4 [ci skip] | Vijay Dev | 2012-03-09 | 4 | -1/+27 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-09 | 11 | -30/+81 |
|\ \ | |||||
| * | | Revert "Add rails glossary of common terms & concepts" | Vijay Dev | 2012-03-08 | 2 | -428/+0 |
| | | | | | | | | | | | | | | | | | | This reverts commit fd584a63deb8d2f1e8969d8527e7a9dbd9d68848. Reason: This is not suitable for a Rails guide in my opinion. | ||||
| * | | copy edits [ci skip] | Vijay Dev | 2012-03-07 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #88 from kevingriffin/master | Vijay Dev | 2012-03-07 | 1 | -5/+5 |
| |\ \ | | | | | | | | | Correct "its" usage for "AJAX on Rails" page | ||||
| | * | | Correct it's/its usage. | Kevin Griffin | 2012-03-06 | 1 | -5/+5 |
| | | | | |||||
| * | | | Improve docs for attr_accessible|protected related to Hash#except|slice | Carlos Antonio da Silva | 2012-03-06 | 1 | -8/+10 |
| | | | | |||||
| * | | | Add some docs for ActionController::Base.without_modules | Carlos Antonio da Silva | 2012-03-06 | 1 | -0/+10 |
| | | | | |||||
| * | | | Left off a : when specifying the :namespace option for a :controller | coreyhaines | 2012-03-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | path segment |