| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | update caching with rails guide to reflect action and page extraction [ci skip] | Francesco Rodriguez | 2012-10-05 | 1 | -5/+8 | |
| | | | | ||||||
| | * | | Add CollectionAssociation#destroy to ActiveRecord::Association::ClassMethods ↵ | Samuel Cochran | 2012-10-05 | 1 | -3/+15 | |
| | | | | | | | | | | | | | code docs | |||||
| | * | | Add CollectionAssociation#destroy to association guide | Samuel Cochran | 2012-10-05 | 1 | -0/+23 | |
| | | | | ||||||
| | * | | Merge pull request #116 from jarednipper/master | Jared Nipper | 2012-10-03 | 1 | -2/+2 | |
| | |\ \ | | | | | | | | | Fixed two typos in the testing guide | |||||
| | | * | | Fixed typo in command to run unit test | Jared Nipper | 2012-10-01 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | Fixed typo in command to run unit test | Jared Nipper | 2012-10-01 | 1 | -1/+1 | |
| | | |/ | ||||||
| | * | | Fix all examples in comments in active_model attribute methods | Nick Rowe | 2012-10-02 | 1 | -6/+6 | |
| | | | | ||||||
| | * | | Fix Example in active model attribute methods | Nick Rowe | 2012-10-02 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Fixing markdown typos in upgrading_ruby_on_rails.md | David A McClain | 2012-10-02 | 1 | -2/+4 | |
| | | | | ||||||
| | * | | Add command before bash output | schneems | 2012-10-02 | 1 | -0/+3 | |
| | | | | | | | | | | | | | Add tip for command line. | |||||
| | * | | add command line $ tip for new programmers | schneems | 2012-10-02 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | improve wording over `change` method docs | schneems | 2012-10-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | The feature is available after Rails 3.1 and this is no longer a "new" feature. | |||||
| | * | | instructions for running migrations in another ENV | schneems | 2012-10-02 | 1 | -1/+9 | |
| | | | | ||||||
| | * | | Add /rails/info/routes method to getting_started | schneems | 2012-10-02 | 1 | -3/+3 | |
| | | | | | | | | | | | | | Also fix # to $ for `rake routes` command | |||||
| | * | | explain how to check if the server has returned on *nix systems in ↵ | schneems | 2012-10-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | getting_started guide | |||||
| | * | | Explain that command line commands have $ | schneems | 2012-10-02 | 1 | -0/+7 | |
| | | | | | | | | | | | | | This was extremely confusing to new programmers, also different operating systems call the command line something different | |||||
| | * | | change `#` to `$` in bash section | schneems | 2012-10-02 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Space between "every" and "time" | schneems | 2012-10-02 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | use <url> markdown syntax instead of [url](url) [ci skip] | Francesco Rodriguez | 2012-10-01 | 1 | -13/+13 | |
| | | | | ||||||
| | * | | Fix truncated line in the i18n edge guide | Victor Costan | 2012-10-01 | 1 | -1/+1 | |
| | |/ | ||||||
| | * | fix example in Migration docs [ci skip] | Francesco Rodriguez | 2012-09-30 | 1 | -1/+1 | |
| | | | ||||||
| | * | add change_table transformation to Migration docs [ci skip] | Francesco Rodriguez | 2012-09-30 | 1 | -16/+19 | |
| | | | ||||||
| | * | updates latest Rails version number | Fabrizio Regini | 2012-09-30 | 1 | -1/+1 | |
| | | | ||||||
| | * | Make strong_parameters example simpler | Guillermo Iguaran | 2012-09-30 | 1 | -4/+5 | |
| | | | ||||||
| * | | fix github url [ci skip] | Vijay Dev | 2012-10-11 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #7902 from josh/fix-bug-in-as-cache-upgrade | David Heinemeier Hansson | 2012-10-10 | 1 | -1/+1 | |
| |\ \ | | | | | | | Fix AS::Cache version upgrading bug | |||||
| | * | | Ensure expires_in and created_at timestamps aren't nil when attempting to ↵ | Joshua Peek | 2012-10-10 | 1 | -1/+1 | |
| |/ / | | | | | | | upgrade cache | |||||
| * | | Add changelog entry for killing the asset tag concatenation | David Heinemeier Hansson | 2012-10-10 | 1 | -0/+2 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2012-10-10 | 60 | -1349/+266 | |
| |\ \ | ||||||
| | * \ | Merge pull request #7900 from josh/kill-old-asset-tag-helper-concat | David Heinemeier Hansson | 2012-10-10 | 5 | -1132/+16 | |
| | |\ \ | | | | | | | | | Remove old asset tag concatenation | |||||
| | | * | | Remove expansion config | Joshua Peek | 2012-10-10 | 1 | -2/+0 | |
| | | | | | ||||||
| | | * | | Remove old asset tag concatenation | Joshua Peek | 2012-10-10 | 5 | -1130/+16 | |
| | |/ / | | | | | | | | | | Use sprockets, jammit, or some other asset bundler | |||||
| | * | | Merge pull request #7899 from asanghi/master | Vijay Dev | 2012-10-10 | 2 | -0/+6 | |
| | |\ \ | | | | | | | | | Add missing CHANGELOG relating to addition of callbacks to mailers | |||||
| | | * | | Add missing CHANGELOG related to addition of callbacks to mailers. | Aditya Sanghi | 2012-10-10 | 2 | -0/+6 | |
| | | | | | ||||||
| | * | | | Merge pull request #7897 from arunagw/warning_fixes_assert_match | Vijay Dev | 2012-10-10 | 1 | -7/+7 | |
| | |\ \ \ | | |/ / | |/| | | warning fixed: ambiguous first argument; put parentheses or even spaces | |||||
| | | * | | warning fixed: ambiguous first argument; put parentheses or even spaces | Arun Agrawal | 2012-10-10 | 1 | -7/+7 | |
| | | | | | ||||||
| | * | | | Merge pull request #7895 from mdaisuke/guides_typo | Vijay Dev | 2012-10-09 | 1 | -1/+1 | |
| | |\ \ \ | | |/ / | |/| | | fix typo in "The Rails Initialization Process" | |||||
| | | * | | fix typo in "The Rails Initialization Process" | mdaisuke | 2012-10-10 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Merge pull request #7859 from ernie/fix-collection-associations-with-select | Aaron Patterson | 2012-10-09 | 2 | -1/+9 | |
| | |\ \ \ | | |/ / | |/| | | Fix has_many assocation w/select load after create | |||||
| | | * | | Fix has_many assocation w/select load after create | Ernie Miller | 2012-10-05 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you create a new record via a collection association proxy that has not loaded its target, and which selects additional attributes through the association, then when the proxy loads its target, it will inadvertently trigger an ActiveModel::MissingAttributeError during attribute writing when CollectionAssociation#merge_target_lists attempts to do its thing, since the newly loaded records will possess attributes the created record does not. This error also raises a bogus/confusing deprecation warning when accessing the association in Rails 3.2.x, so cherry-pick would be appreciated! | |||||
| | * | | | Merge pull request #7878 from blowmage/test_locations | Jeremy Kemper | 2012-10-09 | 34 | -146/+187 | |
| | |\ \ \ | | | | | | | | | | | Update test names and locations | |||||
| | | * | | | Update test locations | Mike Moore | 2012-10-09 | 34 | -146/+187 | |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default test locations to avoid confusion around the common testing terms "unit" and "functional". Add new rake tasks for the new locations, while maintaining backwards compatibility with the old rake tasks. New testing locations are as follows: app/models -> test/models (was test/units) app/helpers -> test/helpers (was test/units/helpers) app/controllers -> test/controllers (was test/functional) app/mailers -> test/mailers (was test/functional) | |||||
| | * | | | let (array|hash)/conversions.rb load the extensions in ↵ | Xavier Noria | 2012-10-09 | 3 | -3/+5 | |
| | | | | | | | | | | | | | | | | | object/to_(param|query).rb | |||||
| | * | | | adds a missing require | Xavier Noria | 2012-10-09 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | Merge pull request #7885 from guilleiguaran/railties-changelog | Rafael Mendonça França | 2012-10-09 | 1 | -2/+7 | |
| | |\ \ \ | | | | | | | | | | | Add missing entry in CHANGELOG about config.assets.cache change | |||||
| | | * | | | Add missing entry in CHANGELOG about config.assets.cache change | Guillermo Iguaran | 2012-10-09 | 1 | -2/+7 | |
| | | | | | | ||||||
| | * | | | | Merge pull request #7883 from guilleiguaran/refactor-assets-test | Rafael Mendonça França | 2012-10-09 | 2 | -16/+1 | |
| | |\ \ \ \ | | | | | | | | | | | | | Minor refactors in assets test | |||||
| | | * | | | | Remove duplicated test | Guillermo Iguaran | 2012-10-09 | 1 | -15/+0 | |
| | | | | | | | ||||||
| | | * | | | | Minor test refactoring: Use add_to_env instead of an initializer | Guillermo Iguaran | 2012-10-09 | 1 | -1/+1 | |
| | | |/ / / | ||||||
| | * | | | | adds missing require | Xavier Noria | 2012-10-09 | 1 | -0/+1 | |
| | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |