aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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 RegexpGrant Hutchins2012-03-102-2/+13
* | | Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_separatorAaron Patterson2012-03-122-1/+5
|\ \ \
| * | | 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 instead of no-op'in...Jonathan Rochkind2012-03-121-1/+2
|/ / / /
* | | | 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 FixnumDenis Jean2012-03-122-1/+5
|/ / / /
* | | | Merge pull request #5387 from panthomakos/autoloadJosé Valim2012-03-121-4/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Improved ActiveSupport::Autoload performance.Pan Thomakos2012-03-111-4/+7
|/ / /
* | | 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
| |/ / /