aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rails 4 is just around the corner. Stuck with 1.8 until then.Jeremy Kemper2011-10-131-3/+3
* Tests gotta run in 1.8 tooJeremy Kemper2011-10-131-2/+2
* Merge pull request #2224 from kommen/fix_fragment_caching_for_masterSantiago Pastorino2011-10-130-0/+0
|\
| * Fix fragment cache helper regression on cache miss introduced with 03d01ec7.Dieter Komendera2011-07-233-1/+51
* | Added ActiveRecord::Base.store for declaring simple single-column key/value s...David Heinemeier Hansson2011-10-137-1/+93
* | Merge pull request #2219 from kommen/fix_fragment_caching_squashedSantiago Pastorino2011-10-133-1/+51
* | Merge pull request #3315 from rahul100885/rahul100885_workspaceJosé Valim2011-10-131-0/+5
|\ \
| * | Added test to check that the vendor/assets/stylesheets directory is createdRahul Chaudhari2011-10-131-0/+5
|/ /
* | Merge pull request #3287 from sgerrand/vendor_assets_javascripts_should_be_cr...José Valim2011-10-122-0/+10
|\ \
| * | Added test to check that the vendor/assets/javascripts directory is createdSasha Gerrand2011-10-111-0/+5
| * | Added method to create vendor/assets/javascripts, added it to methods called ...Sasha Gerrand2011-10-111-0/+5
* | | Add some implementation docs. closes #3298. closes #2509.José Valim2011-10-121-0/+4
* | | Fix version number in CHANGELOGJeremy Kemper2011-10-111-1/+1
* | | Treat 303 See Other as a redirect response, tooJeremy Kemper2011-10-114-6/+29
* | | Merge remote-tracking branch 'jimherz/activeresource_redirection_patch'Jeremy Kemper2011-10-113-3/+12
|\ \ \
| * | | activeresource should treat HTTP status 307 as redirection, same as 301 and 3...Jim Herzberg2011-10-113-3/+12
|/ / /
* | | Merge pull request #3295 from zhengjia/masterJosé Valim2011-10-112-1/+9
|\ \ \
| * | | Fixed serialization issues with multiple includes with optionszhengjia2011-10-112-1/+9
|/ / /
* | | Merge pull request #3289 from avakhov/p-respond_to-conditionsJosé Valim2011-10-112-4/+4
|\ \ \
| * | | Support symbol and string actions in AC#respond_to optionsAlexey Vakhov2011-10-112-4/+4
|/ / /
* | | Merge pull request #3285 from dcrec1/masterJosé Valim2011-10-102-3/+14
|\ \ \
| * | | allow shorthand routes with nested optional parametersDiego Carrion2011-10-102-3/+14
| |/ /
* | | Merge pull request #3286 from rahul100885/rahul100885_workspaceVijay Dev2011-10-101-1/+1
|\ \ \ | |/ / |/| |
| * | Corrected typoRAHUL CHAUDHARI2011-10-111-1/+1
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-104-26/+245
|\ \
| * | [engines guide] add TODO for RedCarpet exampleRyan Bigg2011-10-101-1/+1
| * | [engines guide] cover generating the comment resourceRyan Bigg2011-10-101-2/+84
| * | Fix rails/generators/base.rb documentation for generator lookupRyan Bigg2011-10-101-3/+3
| * | [engines guide] amend two TODOs for further things in this guideRyan Bigg2011-10-101-1/+2
| * | [engines guide] finish covering what the scaffold generator does within an en...Ryan Bigg2011-10-101-2/+42
| * | [engines guide] final line changeRyan Bigg2011-10-101-1/+2
| * | [engines guide] Add TODO for mentioning rails s and rails cRyan Bigg2011-10-101-0/+2
| * | [engines guide] begin explaining what the scaffold generator outputs within a...Ryan Bigg2011-10-101-2/+56
| * | [engines guide] reword first two dot points in prologueRyan Bigg2011-10-101-2/+2
| * | [engines guide] Credit where credit is due + explaning directory structureRyan Bigg2011-10-101-3/+40
| * | [engines guide] Credit where credit is dueRyan Bigg2011-10-101-0/+2
| * | Copy editing to improve readability, consistency, and tonemhutchin2011-10-091-4/+4
| * | Minor copy editingmhutchin2011-10-091-1/+1
| * | Merge pull request #70 from mcdd/masterGuillermo Iguaran2011-10-091-2/+2
| |\ \
| | * | ActiveRecordStore is now called SessionStore.Dan McDonald2011-10-091-2/+2
| * | | Copy editing: s/Rails guesses/Rails assumes/gmhutchin2011-10-091-7/+7
| |/ /
* | | Merge pull request #3274 from arunagw/warning_removed_mysql2Vijay Dev2011-10-101-2/+2
|\ \ \
| * | | ambiguous first argument; put parentheses or even spaces Warning removed!Arun Agrawal2011-10-101-2/+2
* | | | Merge pull request #3265 from arunagw/warning_uri_parserVijay Dev2011-10-101-1/+1
|\ \ \ \
| * | | | URI.escape is obsolete : warning removedArun Agrawal2011-10-091-1/+1
* | | | | Merge pull request #3275 from simi/patch-1José Valim2011-10-101-7/+8
|\ \ \ \ \
| * | | | | Active Record changelog mistakesJosef Šimánek2011-10-101-7/+8
|/ / / / /
* | | | | Merge pull request #3272 from odorcicd/fix_json_error_rootJosé Valim2011-10-102-1/+35
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | JSON responder should return errors with :error rootDenis Odorcic2011-10-102-1/+35
|/ / / /
* | | | Use broken YAML that will fail with Syck as well as Psych. Fixes test_broken_...Jon Leighton2011-10-091-2/+2