aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3334 from mperham/masterAaron Patterson2011-10-163-8/+8
|\
| * Default timestamps to non-nullMike Perham2011-10-143-8/+8
* | Merge pull request #3343 from vatrai/fix_warningVijay Dev2011-10-161-2/+2
|\ \
| * | fix to remove warning in test casesVishnu Atrai2011-10-161-2/+2
|/ /
* | Merge pull request #3320 from sunaku/space-alignJosé Valim2011-10-151-6/+6
|\ \ | |/ |/|
| * fix inconsistent alignment in Gemfile generatorSuraj N. Kurapati2011-10-131-6/+6
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-1413-89/+206
|\ \
| * \ Merge pull request #72 from pote/masterVijay Dev2011-10-141-1/+1
| |\ \
| | * | security reasonS should be pluralPoTe2011-10-131-1/+1
| * | | [engines guide] WIP for explaining how to hook engine into applicationRyan Bigg2011-10-141-0/+46
| * | | [engines guide] complete comments resource generationRyan Bigg2011-10-141-0/+65
| * | | [engines guide] Add heading for commentsRyan Bigg2011-10-141-0/+1
| * | | [engines guide] make clear that the comment generator command is just one lineRyan Bigg2011-10-141-6/+11
| * | | [engines guide] make it clear that the scaffold generator output isn't part o...Ryan Bigg2011-10-141-6/+11
| * | | [engines guide] correct render line is blorgh/comments/formRyan Bigg2011-10-141-1/+1
| * | | [engines guide] improve wording for sentence describing comments/form partialRyan Bigg2011-10-141-1/+1
| |/ /
| * | improved ActiveResource's .element_path and .new_element_path methods documen...Diego Carrion2011-10-131-0/+8
| * | [engines guide] don't show actual timestamp in migration generationRyan Bigg2011-10-131-1/+1
| * | [engines guide] change comments resource generationRyan Bigg2011-10-131-54/+33
| * | refactor guide exampleVijay Dev2011-10-131-3/+3
| * | change activerecord query conditions example to avoid 'type' as column nameSteve Bourne2011-10-121-2/+2
| * | quoting 'and' to make it more distinct.Craig Monson2011-10-121-1/+1
| * | status is a number in Rails 3Akira Matsuda2011-10-121-2/+2
| * | Runtime conditions for associations should use procsStephen Pike2011-10-111-4/+2
| * | Heavy copy editing of the find_each and find_in_batches sectionmhutchin2011-10-111-26/+34
| * | Use .add instead of << to add errorsEvgeniy Dolzhenko2011-10-113-6/+6
| * | Merge pull request #71 from rahul100885/rahul100885_workspaceRahul P. Chaudhari2011-10-111-2/+2
| |\ \
| | * | Fixed typos in active_support_core_extensions.textileRAHUL CHAUDHARI2011-10-111-2/+2
| |/ /
| * | Add ActionController#head exampleAlexey Vakhov2011-10-111-0/+2
* | | Merge pull request #3331 from fabrik42/masterJosé Valim2011-10-143-3/+30
|\ \ \
| * | | Consider attempted action in exception message of ActiveRecord::StaleObjectErrorChristian Bäuerlein2011-10-142-6/+7
| * | | Includes stale record in StaleObjectErrorChristian Bäuerlein2011-10-143-3/+29
|/ / /
* | | Symbol captures may generate multiple path segments, so don't escape / -> %2F...Jeremy Kemper2011-10-131-7/+17
* | | / is allowed in URI fragmentsJeremy Kemper2011-10-132-3/+3
* | | Leave escaping up to JourneyJeremy Kemper2011-10-131-4/+3
* | | Failing tests for path parameter escapingJeremy Kemper2011-10-131-0/+27
* | | Merge pull request #3314 from macmartine/masterSantiago Pastorino2011-10-132-1/+2
|\ \ \
| * | | remove user-specified delimiter from start when no area code is present (in n...Mac Martine2011-10-122-1/+2
* | | | 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