aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Allow retrieve_cache_key to work on collections such as ActiveRecord::Relation.Erich Menge2012-03-122-0/+5
|
* 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
| | |
* | | Fix broken testsSantiago Pastorino2012-03-102-1/+4
| | |
* | | Merge pull request #5371 from jsl/fix_actionmailer_testsJosé Valim2012-03-101-1/+1
|\ \ \ | | | | | | | | Fix actionmailer tests broken by #4751a69
| * | | Fix actionmailer tests broken by #4751a69Justin S. Leitgeb2012-03-101-1/+1
|/ / /
* | | AbstractController.action_methods should return a SetSantiago Pastorino2012-03-102-3/+4
| | |
* | | Merge pull request #5367 from carlosantoniodasilva/middleware-apiSantiago Pastorino2012-03-105-24/+67
|\ \ \ | |_|/ |/| | Change api_only to http_only and add MiddlewareStackProxy docs
| * | Change api_only to http_onlyCarlos Antonio da Silva2012-03-105-21/+20
| | | | | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino]
| * | Add some docs for MiddlewareStackProxy methods and api_only!Carlos Antonio da Silva2012-03-103-5/+49
|/ / | | | | | | [Carlos Antonio da Silva & Santiago Pastorino]
* | Merge pull request #5364 from ↵José Valim2012-03-102-24/+18
|\ \ | | | | | | | | | | | | carlosantoniodasilva/active-model-serialization-include Active model serialization :include returning string keys
| * | Rename variable to avoid using name "include"Carlos Antonio da Silva2012-03-091-8/+4
| | | | | | | | | | | | Better syntax highlight :)
| * | Remove Array#wrap usage in AMo serializationCarlos Antonio da Silva2012-03-091-2/+1
| | |
| * | Make sure serializable hash with :include always returns string keysCarlos Antonio da Silva2012-03-092-15/+14
|/ /
* | Install latest bundler on Travis.José Valim2012-03-091-0/+2
| |
* | Bump bundler dependency.José Valim2012-03-091-1/+1
| |
* | Merge pull request #5356 from carlosantoniodasilva/rake-test-systemJosé Valim2012-03-094-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 callsCarlos Antonio da Silva2012-03-084-106/+98
| | |
* | | Merge pull request #5352 from avakhov/ar_finder_sql_uniq_idsJosé Valim2012-03-092-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 Vakhov2012-03-092-1/+8
|/ / / | | | | | | | | | correct
* | | Merge pull request #5351 from shanna/masterJosé Valim2012-03-081-0/+1
|\ \ \ | | | | | | | | Missing active_model/naming.rb dependency.
| * | | Added missing ActiveModel::Naming dependency.Shane Hanna2012-03-091-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 Dev2012-03-091-1/+1
| | | |
* | | | Merge pull request #5349 from rafaelfranca/changelog-fixVijay Dev2012-03-087-10/+59
|\ \ \ \ | | | | | | | | | | Fix my name in the CHANGELOG to follow the convention
| * | | | Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-097-10/+59
| |/ / / | | | | | | | | | | | | Also add missing entries and use the formating convention
* | | | Merge pull request #5348 from rafaelfranca/fix-warningVijay Dev2012-03-081-1/+1
|\ \ \ \ | |/ / / |/| | | Remove warning of unused variable
| * | | Remove warning of unused variableRafael Mendonça França2012-03-081-1/+1
|/ / /
* | | ensure that released connections move between threadsAaron Patterson2012-03-081-0/+18
| | |
* | | make active_connection? return true only if there is an open connection in ↵Aaron Patterson2012-03-082-7/+39
|/ / | | | | | | use for the current thread. fixes #5330
* | fix incorrect changelog headings [ci skip].Vijay Dev2012-03-093-25/+27
| | | | | | | | Last commit message should not have said 'Rails 4' either
* | changelog updates for Rails 4 [ci skip]Vijay Dev2012-03-094-1/+27
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-0911-30/+81
|\ \
| * | Revert "Add rails glossary of common terms & concepts"Vijay Dev2012-03-082-428/+0
| | | | | | | | | | | | | | | | | | This reverts commit fd584a63deb8d2f1e8969d8527e7a9dbd9d68848. Reason: This is not suitable for a Rails guide in my opinion.
| * | copy edits [ci skip]Vijay Dev2012-03-071-2/+2
| | |
| * | Merge pull request #88 from kevingriffin/masterVijay Dev2012-03-071-5/+5
| |\ \ | | | | | | | | Correct "its" usage for "AJAX on Rails" page
| | * | Correct it's/its usage.Kevin Griffin2012-03-061-5/+5
| | | |
| * | | Improve docs for attr_accessible|protected related to Hash#except|sliceCarlos Antonio da Silva2012-03-061-8/+10
| | | |
| * | | Add some docs for ActionController::Base.without_modulesCarlos Antonio da Silva2012-03-061-0/+10
| | | |
| * | | Left off a : when specifying the :namespace option for a :controllercoreyhaines2012-03-061-1/+1
| | | | | | | | | | | | | | | | path segment
| * | | In a nested resource route, the parent resource param is <resource_name>_idcoreyhaines2012-03-061-8/+8
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 08:59:59 +0000