aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
| * Revert "Fix error: docrails is a fork, not a branch."Xavier Noria2011-02-151-1/+1
| | | | | | | | | | | | Reason: Calling docrails a "branch" is fine, no need to change the terminology. It is a remote in my machine, and it has been called branch since the very beginning: http://weblog.rubyonrails.org/2008/5/2/help-improve-rails-documentation-on-git-branch This reverts commit 35a266edfd9ac0f3afe7f7f13c2dcf29cb4b651f.
| * Fix error: docrails is a fork, not a branch.Ben Orenstein2011-02-151-1/+1
| |
| * Added --sandbox option to rails console explanation.Dan Neumann2011-02-131-1/+3
| |
| * Added simple demonstration of has_many :throughDan Neumann2011-02-131-0/+6
| |
| * change plugins guide to favor gem based plugins, clean up to reflect the ↵Mike Gehard2011-02-131-1249/+200
| | | | | | | | state of Rails3 plugins, remove information not compatible with Rails3.
| * the shell prompt for non-root sessions is "$" by conventionXavier Noria2011-02-131-1/+1
| |
| * Revert "Add note about running `bundle install` as root. Solves issue with ↵Xavier Noria2011-02-131-1/+0
| | | | | | | | | | | | | | | | '#' not being rendered, and it's more clear for beginners." Reason: Running bundle as root is not recommended. This reverts commit 0d40e2c397c9ce92c839a3c318ed8757cf213413.
| * Add note about running `bundle install` as root. Solves issue with '#' not ↵Corey Ward2011-02-121-0/+1
| | | | | | | | being rendered, and it's more clear for beginners.
| * Change fenomenal to phenomenal.jonnii2011-02-101-1/+1
| |
| * updated reference to remote_form_forVijay Dev2011-02-111-2/+2
| |
| * fix typos, minor editsVijay Dev2011-02-101-5/+5
| |
| * replaced MODEL.human_name with MODEL.model_name.human now that .human_name ↵John Paul Ashenfelter2011-02-091-5/+5
| | | | | | | | is deprecated
| * minor fixes in generatorsVijay Dev2011-02-091-10/+12
| |
| * Add note that validates_length_of will incorrectly pluralize min. length 1Kevin Skoglund2011-02-071-0/+2
| |
| * ActiveRecord :default_timezone is :utc in Rails, as set by ↵Paul Annesley2011-02-061-1/+1
| | | | | | | | active_record/railtie.rb
| * fix minor typoVijay Dev2011-02-071-1/+1
| |
| * Add CSS fix for WebKit/Mac rendering issue.Henry Phan2011-02-052-0/+18
| |
* | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-182-2/+7
|\ \ | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb
| * | Fixed issue #6363, avoid to pluralized already pluralized names and ↵Timothy N. Tsvetkov2011-02-162-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | singularize a single in generators, for example stadia is a valid plural for stadium. But calling pluralize for stadia will return stadias which sematically is not corrent in this case [#6363 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1571-4992/+3558
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/examples/performance.rb activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/nested_attributes.rb activerecord/test/cases/relations_test.rb
| * | Add notes on how to override the default :id constraint [#5994 state:resolved]Andrew White2011-02-141-0/+4
| | |
| * | Remove incorrect assert_recognizes exampleAndrew White2011-02-141-6/+0
| | |
| * | added proper require for ruby-debug19 gem to generated GemfileWojciech Wnętrzak2011-02-121-1/+1
| | | | | | | | | | | | | | | | | | [#6419 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | now that the API guidelines are a guide, it is enough to assert that the ↵Xavier Noria2011-02-091-1/+1
| | | | | | | | | | | | names of Rails components have a space, no need to say it was checked with David in the past
| * | Application's assets should have higher priority than engine's onesPiotr Sarnacki2011-02-091-1/+4
| | | | | | | | | | | | [#6388 state:resolved]
| * | Failing test for #6388Eric Allam2011-02-091-0/+28
| | |
| * | Make rails.js include the CSRF token in the X-CSRF-Token header with every ↵Michael Koziarski2011-02-081-0/+16
| | | | | | | | | | | | ajax request.
| * | Updated form rails guide for new place of authenticity_token optionTimothy N. Tsvetkov2011-02-071-3/+3
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | fix db:fixtures:load with FIXTURES specified [#6061 state:resolved]John Hawthorn2011-02-061-0/+17
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Added tests for form_for and an authenticity_token option. Added docs for ↵Timothy N. Tsvetkov2011-02-051-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | for_for and authenticity_token option. Added section to form helpers guide about forms for external resources and new authenticity_token option for form_tag and form_for helpers. [#6228 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Update jQuery UJSSantiago Pastorino2011-02-051-149/+143
| |/
| * git am is better hereSantiago Pastorino2011-02-041-1/+1
| |
| * Correct migration name the test is looking to match.Ben Orenstein2011-02-041-1/+1
| | | | | | | | | | | | [#6375 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Drop remaining script/plugin sources referencesTim Pope2011-02-031-6/+1
| | | | | | | | | | | | [#3742 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-025-10/+6
| |\
| | * Fixed the SelectorAssertions documentation url.Fred Wu2011-02-021-1/+1
| | |
| | * small edit on options extraction documentationPaul Yoder2011-01-311-1/+1
| | |
| | * corrected a mistake in the documentation for assert_migrationmisfo2011-01-291-1/+1
| | |
| | * Refer to the correct action - it's the update action, in the special case ↵Keith Wansbrough2011-01-271-1/+1
| | | | | | | | | | | | where we want to render the edit view.
| | * Revert "fix csrf_meta_tag"Vijay Dev2011-01-241-1/+1
| | | | | | | | | | | | This reverts commit 6641bf877a8408eb28d76077bb0a346a97465485.
| | * filter_parameter_logging => config.filter_parametersVijay Dev2011-01-231-6/+2
| | |
| | * fix csrf_meta_tagVijay Dev2011-01-231-1/+1
| | |
| * | Configurable generation of add_index for references columnsMichał Łomnicki2011-02-011-0/+41
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Update to jQuery 1.5Santiago Pastorino2011-02-011-852/+1849
| | | | | | | | | | | | | | | Check out http://blog.jquery.com/2011/01/31/jquery-15-released/ for more information.
| * | Additionally trigger i18n configuration setup before any eager loading ↵Saimon Moore2011-02-011-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | [#6353 state:resolved] This handles the case where config.cache_classes is true and classes are loaded before the I18n load path has had a chance to be populated. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Accept 'postgres' as a PostgreSQL driver name in dbconsole for non-AR ORMs ↵Akira Matsuda2011-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | like DataMapper and Sequel [#6180 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | updating Gemfile with more contemporary examplegeemus2011-01-311-1/+1
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | "rails dbconsole t" must not load "production" but "test"Akira Matsuda2011-01-311-1/+1
| | | | | | | | | | | | | | | | | | [#6293 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Merge branch 'fix-gitignore' of https://github.com/telemachus/rails into ↵Mikel Lindsaar2011-01-301-1/+1
| |\ \ | | | | | | | | | | | | telemachus-fix-gitignore
| | * | Minor fix to gitignore syntaxPeter Aronoff2011-01-141-1/+1
| | | |