Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | We really don't care about IM middleware order, the important is that it ↵ | Emilio Tagua | 2011-02-18 | 1 | -1/+1 | |
| | | | | gets included. | |||||
* | merges docrails | Xavier Noria | 2011-02-18 | 15 | -1321/+347 | |
|\ | ||||||
| * | removes indent from guides example | Xavier Noria | 2011-02-18 | 1 | -1/+1 | |
| | | ||||||
| * | Revert "Created a new Troubleshooting section in the migrations guide." | Xavier Noria | 2011-02-18 | 1 | -14/+1 | |
| | | | | | | | | | | | | | | | | | | Mismatches between migrations and constants have nothing to do with pluralization rules or model names. The mismatch happens between the camelization of the filename minus timestamp, and the name of the migration class itself. This reverts commit 1c21f75f1b32ee8723c74a9bc7af70dfa02a509c. | |||||
| * | Remove awkward phrasing from Ajax on Rails guide | Nicholas Rowe | 2011-02-17 | 1 | -1/+1 | |
| | | ||||||
| * | Fix Typos: remove several occurences of the the | Nicholas Rowe | 2011-02-17 | 1 | -1/+1 | |
| | | ||||||
| * | Created a new Troubleshooting section in the migrations guide. | Kedar Mhaswade | 2011-02-17 | 1 | -1/+14 | |
| | | | | | | | | | | Added a bullet point there showing how the Uninitialized Constant (missing migration class) error looks like. | |||||
| * | Add description of transaction callbacks to ActiveRecord callbacks guide. | Brian Durand | 2011-02-17 | 1 | -0/+35 | |
| | | ||||||
| * | update caching guide with the changes to ActiveSupport::Cache from the 3.0.0 ↵ | Brian Durand | 2011-02-17 | 1 | -42/+52 | |
| | | | | | | | | release. | |||||
| * | fix typo | Vijay Dev | 2011-02-17 | 1 | -1/+1 | |
| | | ||||||
| * | Revert "Fix error: docrails is a fork, not a branch." | Xavier Noria | 2011-02-15 | 1 | -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 Orenstein | 2011-02-15 | 1 | -1/+1 | |
| | | ||||||
| * | Added --sandbox option to rails console explanation. | Dan Neumann | 2011-02-13 | 1 | -1/+3 | |
| | | ||||||
| * | Added simple demonstration of has_many :through | Dan Neumann | 2011-02-13 | 1 | -0/+6 | |
| | | ||||||
| * | change plugins guide to favor gem based plugins, clean up to reflect the ↵ | Mike Gehard | 2011-02-13 | 1 | -1249/+200 | |
| | | | | | | | | state of Rails3 plugins, remove information not compatible with Rails3. | |||||
| * | the shell prompt for non-root sessions is "$" by convention | Xavier Noria | 2011-02-13 | 1 | -1/+1 | |
| | | ||||||
| * | Revert "Add note about running `bundle install` as root. Solves issue with ↵ | Xavier Noria | 2011-02-13 | 1 | -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 Ward | 2011-02-12 | 1 | -0/+1 | |
| | | | | | | | | being rendered, and it's more clear for beginners. | |||||
| * | Change fenomenal to phenomenal. | jonnii | 2011-02-10 | 1 | -1/+1 | |
| | | ||||||
| * | updated reference to remote_form_for | Vijay Dev | 2011-02-11 | 1 | -2/+2 | |
| | | ||||||
| * | fix typos, minor edits | Vijay Dev | 2011-02-10 | 1 | -5/+5 | |
| | | ||||||
| * | replaced MODEL.human_name with MODEL.model_name.human now that .human_name ↵ | John Paul Ashenfelter | 2011-02-09 | 1 | -5/+5 | |
| | | | | | | | | is deprecated | |||||
| * | minor fixes in generators | Vijay Dev | 2011-02-09 | 1 | -10/+12 | |
| | | ||||||
| * | Add note that validates_length_of will incorrectly pluralize min. length 1 | Kevin Skoglund | 2011-02-07 | 1 | -0/+2 | |
| | | ||||||
| * | ActiveRecord :default_timezone is :utc in Rails, as set by ↵ | Paul Annesley | 2011-02-06 | 1 | -1/+1 | |
| | | | | | | | | active_record/railtie.rb | |||||
| * | fix minor typo | Vijay Dev | 2011-02-07 | 1 | -1/+1 | |
| | | ||||||
| * | Add CSS fix for WebKit/Mac rendering issue. | Henry Phan | 2011-02-05 | 2 | -0/+18 | |
| | | ||||||
* | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 2 | -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. Tsvetkov | 2011-02-16 | 2 | -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_map | Emilio Tagua | 2011-02-15 | 71 | -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 White | 2011-02-14 | 1 | -0/+4 | |
| | | | ||||||
| * | | Remove incorrect assert_recognizes example | Andrew White | 2011-02-14 | 1 | -6/+0 | |
| | | | ||||||
| * | | added proper require for ruby-debug19 gem to generated Gemfile | Wojciech Wnętrzak | 2011-02-12 | 1 | -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 Noria | 2011-02-09 | 1 | -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 ones | Piotr Sarnacki | 2011-02-09 | 1 | -1/+4 | |
| | | | | | | | | | | | | [#6388 state:resolved] | |||||
| * | | Failing test for #6388 | Eric Allam | 2011-02-09 | 1 | -0/+28 | |
| | | | ||||||
| * | | Make rails.js include the CSRF token in the X-CSRF-Token header with every ↵ | Michael Koziarski | 2011-02-08 | 1 | -0/+16 | |
| | | | | | | | | | | | | ajax request. | |||||
| * | | Updated form rails guide for new place of authenticity_token option | Timothy N. Tsvetkov | 2011-02-07 | 1 | -3/+3 | |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | fix db:fixtures:load with FIXTURES specified [#6061 state:resolved] | John Hawthorn | 2011-02-06 | 1 | -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. Tsvetkov | 2011-02-05 | 1 | -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 UJS | Santiago Pastorino | 2011-02-05 | 1 | -149/+143 | |
| |/ | ||||||
| * | git am is better here | Santiago Pastorino | 2011-02-04 | 1 | -1/+1 | |
| | | ||||||
| * | Correct migration name the test is looking to match. | Ben Orenstein | 2011-02-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | [#6375 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | Drop remaining script/plugin sources references | Tim Pope | 2011-02-03 | 1 | -6/+1 | |
| | | | | | | | | | | | | [#3742 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-02 | 5 | -10/+6 | |
| |\ | ||||||
| | * | Fixed the SelectorAssertions documentation url. | Fred Wu | 2011-02-02 | 1 | -1/+1 | |
| | | | ||||||
| | * | small edit on options extraction documentation | Paul Yoder | 2011-01-31 | 1 | -1/+1 | |
| | | | ||||||
| | * | corrected a mistake in the documentation for assert_migration | misfo | 2011-01-29 | 1 | -1/+1 | |
| | | | ||||||
| | * | Refer to the correct action - it's the update action, in the special case ↵ | Keith Wansbrough | 2011-01-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | where we want to render the edit view. | |||||
| | * | Revert "fix csrf_meta_tag" | Vijay Dev | 2011-01-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | This reverts commit 6641bf877a8408eb28d76077bb0a346a97465485. |