aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | 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 / -> ↵Jeremy Kemper2011-10-131-7/+17
| | | | | | | | | | | | | | | | %2F. Test splat escaping.
* | | | / 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 number_to_phone)
| * | | | remove user-specified delimiter from start when no area code is present (in ↵Mac Martine2011-10-122-1/+2
| | | | | | | | | | | | | | | | | | | | number_to_phone)
* | | | | 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 03d01e
| * | | | | Fix fragment cache helper regression on cache miss introduced with 03d01ec7.Dieter Komendera2011-07-233-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains following patches cherry-picked from @lhahne's 3-0-stable branch: * Added tests for the output_buffer returned by CacheHelper (c476a6b) The output_buffer returned by CacheHelper should be html_safe if the original buffer is html_safe. * made sure that the possible new output_buffer created by CacheHelper is of the same type as the original (39a4f67)
* | | | | | Added ActiveRecord::Base.store for declaring simple single-column key/value ↵David Heinemeier Hansson2011-10-137-1/+93
| | | | | | | | | | | | | | | | | | | | | | | | stores [DHH]
* | | | | | Merge pull request #2219 from kommen/fix_fragment_caching_squashedSantiago Pastorino2011-10-133-1/+51
| |_|_|/ / |/| | | | | | | | | | | | | | Fix fragment caching (squashed commits)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 05:02:51 +0000