aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #3362 from avakhov/p-superfluous-assign-cookiesVijay Dev2011-10-191-1/+1
|\ \ | | | | | | Remove superfluous assignment in cookies
| * | Remove superfluous assignment in cookiesAlexey Vakhov2011-10-181-1/+1
| | |
* | | only use now() on pg!Aaron Patterson2011-10-181-1/+3
|/ /
* | reset prepared statement when schema changes imapact statement results. ↵Aaron Patterson2011-10-182-11/+51
| | | | | | | | fixes #3335
* | Use again Rack's ContentLength middleware part 2Santiago Pastorino2011-10-181-0/+1
| |
* | Use again Rack's ContentLength middlewareSantiago Pastorino2011-10-183-40/+0
| |
* | Merge pull request #3350 from whilefalse/rake_environment_in_enginesJosé Valim2011-10-182-0/+18
|\ \ | | | | | | Added environment rake task to engines
| * | Added test for rake environment in an enginesteve2011-10-181-0/+17
| | |
| * | Added environment rake task to enginesSteven Anderson2011-10-181-0/+1
| | |
* | | use now() for dates in pgAaron Patterson2011-10-181-1/+1
|/ /
* | Merge pull request #3356 from arunagw/bunp_rackJosé Valim2011-10-171-1/+1
|\ \ | | | | | | Bump Rack to 1.3.5
| * | Bump Rack to 1.3.5Arun Agrawal2011-10-181-1/+1
|/ /
* | Merge pull request #3340 from surfacedamage/exclude_destroy_in_all_blank_checkJosé Valim2011-10-173-2/+16
|\ \ | | | | | | Exclude _destroy parameter in :all_blank check (issue #2937)
| * | Exclude _destroy parameter in :all_blank check (issue #2937)Aaron Christy2011-10-173-2/+16
| | |
* | | Merge pull request #3151 from zenprogrammer/pluralize_without_countJosé Valim2011-10-173-7/+30
|\ \ \ | | | | | | | | Added include_count parameter to pluralize.
| * | | Modified String#pluralize to take an optional count parameter.Ryan Oblak2011-09-283-7/+30
| | | |
* | | | use variables from test setupVijay Dev2011-10-171-6/+4
| | | |
* | | | fix a typo and slightly reword has_secure_password commentVijay Dev2011-10-171-2/+2
| | | |
* | | | Merge pull request #3319 from martinsvalin/active_model_errors_fixesJosé Valim2011-10-172-4/+29
|\ \ \ \ | | | | | | | | | | ActiveModel::Errors#generate_message without i18n_scope, and more test cases for #add
| * | | | ActiveModel::Errors#generate_message without i18n_scope, and more test cases ↵Martin Svalin2011-10-172-4/+29
|/ / / / | | | | | | | | | | | | for #add
* | | | Merge pull request #3334 from mperham/masterAaron Patterson2011-10-163-8/+8
|\ \ \ \ | | | | | | | | | | Default timestamps to non-null
| * | | | 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 cases
| * | | 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 generator
| * | 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
| |\ \ \ | | | | | | | | | | small fix
| | * | | 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 ↵Ryan Bigg2011-10-141-6/+11
| | | | | | | | | | | | | | | | | | | | of the actual command
| * | | | [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 ↵Diego Carrion2011-10-131-0/+8
| | | | | | | | | | | | | | | | documentation by specifing how .site should be declared in order to use prefix_options
| * | | [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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Totally didn't like where this section was going, so scrapped it. Scaffold is great for some things (lol) but nested resources is definitely not one of them. Best to walk people through how to do it right, as they would in the real world
| * | | refactor guide exampleVijay Dev2011-10-131-3/+3
| | | |
| * | | change activerecord query conditions example to avoid 'type' as column nameSteve Bourne2011-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'Type' is a reserved column for STI. Changed conditions example to avoid using that column name as an example. The example isn't STI-related (and mentioning STI here is needless clutter), so changing to avoid accidentally encouraging users to use 'type' as a column name for other purposes.
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The association guide previously recommended using a trick with single quote delaying of string interpolation in order to handle setting association conditions that would be evaluated at runtime. Using a proc is the new way as this no longer works.
| * | | 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.textile
| | * | | 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
|\ \ \ \ | | | | | | | | | | Include affected record when raising an ActiveRecord::StaleObjectError