aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)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
|\
| * Documented the removal of size from text_field based helpers and cols, rows f...Philip Arndt2012-03-121-0/+4
| * 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 cols...Philip Arndt2012-03-109-209/+204
* | Merge pull request #5372 from jsl/add_before_send_to_actionmailerJosé Valim2012-03-112-0/+74
|\ \
| * | Add ability to define callbacks in ActionMailer using AbstractController::Cal...Justin S. Leitgeb2012-03-112-0/+74
|/ /
* | Merge pull request #5373 from nertzy/fix_comments_about_to_partial_pathJosé Valim2012-03-112-3/+3
|\ \
| * | 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 handledSergey Nartimov2012-03-094-9/+37
* | | @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 #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_onlyCarlos Antonio da Silva2012-03-105-21/+20
| * | Add some docs for MiddlewareStackProxy methods and api_only!Carlos Antonio da Silva2012-03-103-5/+49
|/ /
* | Merge pull request #5364 from carlosantoniodasilva/active-model-serialization...José Valim2012-03-102-24/+18
|\ \
| * | Rename variable to avoid using name "include"Carlos Antonio da Silva2012-03-091-8/+4
| * | 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 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] c...Alexey Vakhov2012-03-092-1/+8
|/ / /
* | | Merge pull request #5351 from shanna/masterJosé Valim2012-03-081-0/+1
|\ \ \
| * | | Added missing ActiveModel::Naming dependency.Shane Hanna2012-03-091-0/+1
* | | | 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 conventionRafael Mendonça França2012-03-097-10/+59
| |/ / /
* | | | Merge pull request #5348 from rafaelfranca/fix-warningVijay Dev2012-03-081-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | 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 us...Aaron Patterson2012-03-082-7/+39
|/ /
* | fix incorrect changelog headings [ci skip].Vijay Dev2012-03-093-25/+27
* | 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
| * | copy edits [ci skip]Vijay Dev2012-03-071-2/+2
| * | Merge pull request #88 from kevingriffin/masterVijay Dev2012-03-071-5/+5
| |\ \
| | * | 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
| * | | In a nested resource route, the parent resource param is <resource_name>_idcoreyhaines2012-03-061-8/+8
| |/ /