aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8457 from caike/masterCarlos Antonio da Silva2012-12-081-4/+4
|\
| * Update AR Changelog with correct example using includesCaike Souza2012-12-081-4/+4
* | Merge pull request #8462 from frodsan/update_guides_action_callbacksCarlos Antonio da Silva2012-12-086-21/+21
|\ \
| * | update guides to use _action callbacks [ci skip]Francesco Rodriguez2012-12-076-21/+21
| |/
* | Merge pull request #8459 from frodsan/explicit!Carlos Antonio da Silva2012-12-082-19/+14
|\ \ | |/ |/|
| * fix scaffold controller generator testsFrancesco Rodriguez2012-12-071-16/+12
| * use :only instead of :except callback option in the controller templateFrancesco Rodriguez2012-12-071-3/+2
|/
* Merge pull request #8456 from frodsan/actionize2Xavier Noria2012-12-075-32/+76
|\
| * add tests to aliased _filter callbacksFrancesco Rodriguez2012-12-071-0/+46
| * use `_action` instead of `_filter` callbacksFrancesco Rodriguez2012-12-075-34/+32
|/
* Merge pull request #8455 from frodsan/actionizeXavier Noria2012-12-0714-28/+28
|\
| * update documentation and code to use _action callbacksFrancesco Rodriguez2012-12-0713-25/+25
| * fix prepend_before_filter documentation [ci skip]Francesco Rodriguez2012-12-071-3/+3
* | Merge pull request #8454 from frodsan/deprecate_as_basic_objectJeremy Kemper2012-12-076-15/+29
|\ \
| * | Rename ActiveSupport::BasicObject to ActiveSupport::ProxyObjectFrancesco Rodriguez2012-12-076-15/+29
* | | Let the scaffold example use the "set shared record" pattern to explain callb...David Heinemeier Hansson2012-12-071-6/+7
| |/ |/|
* | Rollback where.like and where.not_likeCarlos Antonio da Silva2012-12-073-46/+4
|/
* Fix READMEDavid Heinemeier Hansson2012-12-071-1/+1
* Rename all action callbacks from *_filter to *_actionDavid Heinemeier Hansson2012-12-073-69/+118
* Merge pull request #8452 from claudiob/explain_where_chain_parametersCarlos Antonio da Silva2012-12-072-2/+23
|\
| * Document the types of arguments accepted by AR#notclaudiob2012-12-072-2/+23
|/
* revises a RDoc example to make it idiomaticXavier Noria2012-12-071-8/+8
* let @version be always externally set in guides generation [fixes #8221]Xavier Noria2012-12-072-2/+2
* Fix where.not with in clauseCarlos Antonio da Silva2012-12-072-4/+4
* Merge pull request #8445 from claudiob/match_rdoc_with_6ba0f97Carlos Antonio da Silva2012-12-071-4/+4
|\
| * Update #where rdoc to match 6ba0f97 [ci skip]claudiob2012-12-071-4/+4
|/
* Revert "Invert precedence of content in ActionDispatch::Static"Andrew White2012-12-074-51/+12
* Move where with blank conditions test to the correct where tests fileCarlos Antonio da Silva2012-12-072-6/+6
* Ensure there won't be any regression with where(nil) callsCarlos Antonio da Silva2012-12-072-5/+5
* Merge pull request #8332 from amatsuda/ar_where_chainCarlos Antonio da Silva2012-12-075-8/+200
|\
| * Relation.where with no args can be chained with not, like, and not_likeAkira Matsuda2012-11-305-8/+198
* | Stop shelling out more than necessaryCarlos Antonio da Silva2012-12-071-10/+10
* | Unscope update_column(s) query to ignore default scopeCarlos Antonio da Silva2012-12-063-1/+43
* | Improve AR changelogCarlos Antonio da Silva2012-12-061-18/+17
* | Remove method redefined warningsCarlos Antonio da Silva2012-12-061-1/+1
* | Use CURRENT_TIMESTAMP since it has apparently better cross db supportCarlos Antonio da Silva2012-12-062-2/+2
* | Run rake tasks all at once in rake dbs test for a speed upCarlos Antonio da Silva2012-12-061-12/+6
* | Merge pull request #8440 from steveklabnik/masterRafael Mendonça França2012-12-061-0/+3
|\ \
| * | CHANGELOG for 78d5d6f.Steve Klabnik2012-12-061-0/+3
|/ /
* | Merge pull request #8439 from joshsusser/fixesCarlos Antonio da Silva2012-12-063-5/+5
|\ \
| * | Oracle needs table to check index existenceJosh Susser2012-12-061-3/+3
| * | convert time to stringJosh Susser2012-12-062-2/+2
* | | Change the encrypted campfire notification tokenRafael Mendonça França2012-12-061-1/+1
* | | Invert precedence of content in ActionDispatch::StaticAndrew White2012-12-064-12/+51
|/ /
* | Refactor tests that switch RAILS_ENV and RACK_ENVCarlos Antonio da Silva2012-12-066-63/+63
* | Add comment about implementation of class_attributeAndrew White2012-12-061-0/+3
* | adds a couple of items to the check list for stable releases [ci skip]Xavier Noria2012-12-061-0/+3
* | Merge pull request #8431 from joshsusser/schemadumpAaron Patterson2012-12-051-4/+2
|\ \
| * | dump schema.rb without :version optionJosh Susser2012-12-051-4/+2
|/ /
* | Merge branch 'joshsusser-master' into mergeAaron Patterson2012-12-0515-58/+268
|\ \