aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] typo in ArgumentError exceptionPeter Vandenabeele2013-11-161-1/+1
* Merge pull request #12907 from JuanitoFatas/upgradingRafael Mendonça França2013-11-151-9/+10
|\
| * [ci skip] Update gem versions for 3.2 and 3.1. Also change some words.Juanito Fatas2013-11-161-9/+10
* | Merge pull request #12703 from makimoto/actionsupport-error-set_backtraceRafael Mendonça França2013-11-153-2/+13
|\ \
| * | Use `set_backtrace` instead of `@backtrace` in ActionView errorShimpei Makimoto2013-11-163-2/+13
* | | Merge pull request #12904 from sbagdat/patch-1Rafael Mendonça França2013-11-151-1/+1
|\ \ \
| * | | Change Relation#all to Relation#load [ci skip]Sıtkı Bağdat2013-11-151-1/+1
| |/ /
* / / test should clean up after themselvesAaron Patterson2013-11-151-0/+3
|/ /
* | Merge pull request #12779 from dougbarth/dont_swallow_exceptions_during_trans...Aaron Patterson2013-11-154-10/+10
|\ \
| * | Remove tests for not swallowing exceptions.Doug Barth2013-11-152-42/+0
| * | Don't swallow exceptions in transctional statementsDoug Barth2013-11-054-10/+52
* | | Merge pull request #12531 from iamvery/database-tasks-exit-statusRafael Mendonça França2013-11-156-16/+51
|\ \ \
| * | | Explicitly exit with status "1" for create and drop failuresJay Hayes2013-11-116-16/+51
* | | | Merge pull request #12853 from joshjordan/masterRafael Mendonça França2013-11-151-1/+1
|\ \ \ \
| * | | | Allocate one less object using html_safe during content_tag constructionJosh Jordan2013-11-141-1/+1
* | | | | Merge pull request #10848 from 907th/add_block_to_cattr_readerRafael Mendonça França2013-11-154-0/+40
|\ \ \ \ \
| * | | | | Unify `cattr_*` interface: allow to pass a block to `cattr_reader`.Alexey Chernenkov2013-11-154-0/+40
| | |_|_|/ | |/| | |
* | | | | explain how `to_param` wil truncate long values. [ci skip] refs #12900.Yves Senn2013-11-151-0/+3
* | | | | Merge pull request #12900 from kuldeepaggarwal/f-to-paramRafael Mendonça França2013-11-152-0/+10
|\ \ \ \ \
| * | | | | added one test case and example for ActiveRecord::Base.to_param methodKuldeep Aggarwal2013-11-152-0/+10
| |/ / / /
* | | | | Merge pull request #12899 from nateberkopec/remove_broken_internal_guide_linkRafael Mendonça França2013-11-151-2/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove broken Commmand Line guide linkNate Berkopec2013-11-151-2/+0
|/ / / /
* | | | Merge pull request #12898 from chocoby/fix/changelog_commentCarlos Antonio da Silva2013-11-151-1/+1
|\ \ \ \
| * | | | Fix CHANGELOG typo [ci skip]chocoby2013-11-151-1/+1
* | | | | Avoid hash lookups for building an array of required defaultsCarlos Antonio da Silva2013-11-151-2/+3
* | | | | Get rid of useless temp variableCarlos Antonio da Silva2013-11-151-2/+1
* | | | | Set values instead of building hashes with single values for mergingCarlos Antonio da Silva2013-11-151-2/+2
|/ / / /
* | | | Merge pull request #9599 from ognevsky/hash-inside-array-in-url-forAndrew White2013-11-154-0/+31
|\ \ \ \
| * | | | Take Hash with options inside Array in #url_forAndrey Ognevsky2013-11-154-0/+31
|/ / / /
* / / / document id prefixed String usage of `.find`. refs #12891 [ci skip]Yves Senn2013-11-151-5/+6
|/ / /
* | | Remove short circuit return in favor of simple conditionalCarlos Antonio da Silva2013-11-151-4/+7
* | | Invert conditional to avoid double checking for RegexpCarlos Antonio da Silva2013-11-151-11/+12
* | | Only check that the option exists once instead of doing on each conditionalCarlos Antonio da Silva2013-11-151-8/+9
* | | Remove argument that is accessible as attributeCarlos Antonio da Silva2013-11-151-3/+3
* | | Cache regexp source on format validation to avoid allocating new objectsCarlos Antonio da Silva2013-11-151-2/+2
* | | Make code simpler to read by using a case statementCarlos Antonio da Silva2013-11-151-2/+6
* | | Avoid a new hash allocationCarlos Antonio da Silva2013-11-151-1/+1
* | | Use a simple conditional rather than short circuit with nextCarlos Antonio da Silva2013-11-151-2/+3
* | | Simplify number parsing logic in numericality validationCarlos Antonio da Silva2013-11-151-10/+3
* | | Avoid creation of extra hash with merge just to set a valueCarlos Antonio da Silva2013-11-151-1/+3
* | | Fix test name [ci skip]Carlos Antonio da Silva2013-11-142-3/+1
* | | Fix AR Changelog examples and improve syntax highlight [ci skip]Carlos Antonio da Silva2013-11-141-12/+12
* | | Set branch for arel in Gemfile so that we can use bundle local config [ci skip]Carlos Antonio da Silva2013-11-141-1/+1
* | | Merge pull request #12862 from chancancode/json_gem_compatJeremy Kemper2013-11-143-3/+80
|\ \ \
| * | | Improved compatibility with the stdlib JSON gem.Godfrey Chan2013-11-143-3/+80
|/ / /
* | | Revert "Used Yield instead of block.call" -- this causes all of atom_feed_hel...David Heinemeier Hansson2013-11-144-9/+9
* | | Fix that eager loading of polymorphic associations did not work with associat...David Heinemeier Hansson2013-11-143-4/+10
* | | Merge pull request #12893 from javan/to-param-addendumRafael Mendonça França2013-11-142-8/+28
|\ \ \
| * | | Addendum to #12891Javan Makhmali2013-11-142-8/+28
* | | | Merge pull request #12819 from vipulnsward/also_dup_column_typesRafael Mendonça França2013-11-141-3/+4
|\ \ \ \