| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | 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 | |
| | | | | | | ||||||
| | * | | | | Merge pull request #7881 from guilleiguaran/fix-initializer | Rafael Mendonça França | 2012-10-09 | 1 | -3/+3 | |
| | |\ \ \ \ | | | | | | | | | | | | | Rails.config doesn't exist, it should be Rails.application.config instead | |||||
| | | * | | | | Rails.config doesn't exist, it should be Rails.application.config instead | Guillermo Iguaran | 2012-10-09 | 1 | -3/+3 | |
| | | |/ / / | ||||||
| | * | | | | copy-edits ae9b3d7 [ci skip] | Xavier Noria | 2012-10-09 | 1 | -2/+3 | |
| | | | | | | ||||||
| | * | | | | AS guide: revises the description of #monday, and #sunday [ci skip] | Xavier Noria | 2012-10-09 | 1 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The start of the week is a parameter nowadays, it is a little confusing that we say here that we assume something about it. Better to use "next" and "previous", which are clear regardless of the concept of beginning of week. Adds examples for the edge cases where the receiver is a Monday or Sunday itself. | |||||
| | * | | | | Merge pull request #7736 from gregolsen/beginning_of_week_guides | Xavier Noria | 2012-10-09 | 1 | -2/+6 | |
| | |\ \ \ \ | | | | | | | | | | | | | ActiveSupport core extensions guides update | |||||
| | | * | | | | active support core extensions guides updated with config.beginning_of_week info | gregolsen | 2012-09-22 | 1 | -2/+6 | |
| | | | | | | | ||||||
| | * | | | | | keys.include? -> key? | Xavier Noria | 2012-10-09 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Merge pull request #7817 from NARKOZ/object-conversions | Xavier Noria | 2012-10-09 | 4 | -11/+2 | |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | | | remove unnecessary object/conversions file | |||||
| | | * | | | | remove unnecessary object/conversions file | Nihad Abbasov | 2012-10-02 | 4 | -11/+2 | |
| | | | | | | | ||||||
| | * | | | | | Merge pull request #7877 from claudiob/remove_duplicate_article_THE | Rafael Mendonça França | 2012-10-08 | 2 | -2/+2 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Remove duplicate 'the' article in commented line | |||||
| | | * | | | | | Remove duplicate 'the' article in commented line | claudiob | 2012-10-08 | 2 | -2/+2 | |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | The sentence used to read "at the bottom of the the compiled file" | |||||
| | * | | | | | Merge pull request #7875 from senny/interpolation_for_execute | Rafael Mendonça França | 2012-10-08 | 1 | -17/+0 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | remove unused `expand_range_bind_variables` method | |||||
| | | * | | | | | remove unused `expand_range_bind_variables` method | Yves Senn | 2012-10-08 | 1 | -17/+0 | |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | this method was not used, not documented and not tested. | |||||
| | * | | | | | Merge pull request #7873 from steveklabnik/update_initializer | David Heinemeier Hansson | 2012-10-08 | 2 | -8/+7 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Moving locale stuff from app.rb to an initializer. | |||||
| | | * | | | | | Moving locale stuff from app.rb to an initializer. | Steve Klabnik | 2012-10-08 | 2 | -8/+7 | |
| | | | | | | | | ||||||
| * | | | | | | | There is already an invitation to use rack-cache in ↵ | David Heinemeier Hansson | 2012-10-08 | 1 | -3/+0 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | config/environments/production.rb | |||||
| * | | | | | | Cleanup comments a bit and fuck 80 characters | David Heinemeier Hansson | 2012-10-08 | 1 | -16/+10 | |
| | | | | | | | ||||||
| * | | | | | | Inline comment | David Heinemeier Hansson | 2012-10-08 | 1 | -3/+1 | |
| |/ / / / / | ||||||
| * | | | | | Encoding already defaults to utf-8 per lib/rails/application/configuration.rb:23 | David Heinemeier Hansson | 2012-10-08 | 1 | -3/+0 | |
| | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |