aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | style cleanupJosh Susser2012-12-033-6/+5
| * | Add migration history to schema.rb dumpJosh Susser2012-12-029-17/+146
| * | Add metadata to schema_migrationsJosh Susser2012-12-0110-43/+125
* | | Merge pull request #8429 from reednj77/turbolinks-js-include-orderCarlos Antonio da Silva2012-12-051-3/+1
|\ \ \
| * | | Revert turbolinks load order requirementNick Reed2012-12-051-3/+1
|/ / /
* | | Fix duplicated method nameCarlos Antonio da Silva2012-12-051-2/+1
* | | Merge pull request #8427 from kennyj/support_rack_envRafael Mendonça França2012-12-057-5/+67
|\ \ \
| * | | Add ENV['RACK_ENV'] support to rake runner/console/server.kennyj2012-12-067-5/+67
|/ / /
* | | Merge pull request #8424 from kennyj/tiny_fixes_20121206Xavier Noria2012-12-051-3/+7
|\ \ \
| * | | silence warning: possibly useless use of a constant in void contextkennyj2012-12-061-3/+7
|/ / /
* | | Merge pull request #8371 from freegenie/5396-conditional-fragment-cachingRafael Mendonça França2012-12-053-1/+83
|\ \ \
| * | | Allow fragment cache to accept :if and :unless optionsFabrizio Regini2012-12-053-1/+83
* | | | Merge pull request #8412 from JoeyButler/action_dispatch_routing_mapper_refac...Rafael Mendonça França2012-12-051-18/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Extract method refactoring in ActionDispatch::Routing::SingletonResource.Joey Butler2012-12-051-18/+14
* | | | Merge pull request #8404 from freegenie/filter_redirectsAndrew White2012-12-059-5/+96
|\ \ \ \
| * | | | Adding filter capability to ActionController logsFabrizio Regini2012-12-059-5/+96
* | | | | Merge pull request #8421 from claudiob/remove_unicode_blanksCarlos Antonio da Silva2012-12-0527-49/+49
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Replace comments' non-breaking spaces with spacesclaudiob2012-12-0427-49/+49
|/ / / /
* | | | Fix Active Record validation error messages markup in guidesCarlos Antonio da Silva2012-12-044-61/+61
* | | | Improve the Active Model guide [ci skip]Carlos Antonio da Silva2012-12-041-33/+27
* | | | Merge pull request #8418 from ershad/masterCarlos Antonio da Silva2012-12-041-1/+1
|\ \ \ \
| * | | | Fixing a couple of spelling mistakesErshad K2012-12-041-1/+1
|/ / / /
* | | | Merge pull request #8417 from kennyj/fix_8414Rafael Mendonça França2012-12-042-3/+8
|\ \ \ \
| * | | | Fix #8414. Performance problem with postgresql adapter primary_key function.kennyj2012-12-052-3/+8