| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 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 expansion config | Joshua Peek | 2012-10-10 | 1 | -2/+0 |
| | | * | Remove old asset tag concatenation | Joshua Peek | 2012-10-10 | 5 | -1130/+16 |
| | |/ |
|
| | * | Merge pull request #7899 from asanghi/master | Vijay Dev | 2012-10-10 | 2 | -0/+6 |
| | |\ |
|
| | | * | 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 | 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" | 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 | Ernie Miller | 2012-10-05 | 2 | -1/+9 |
| | * | | Merge pull request #7878 from blowmage/test_locations | Jeremy Kemper | 2012-10-09 | 34 | -146/+187 |
| | |\ \ |
|
| | | * | | Update test locations | Mike Moore | 2012-10-09 | 34 | -146/+187 |
| | |/ / |
|
| | * | | let (array|hash)/conversions.rb load the extensions in object/to_(param|query... | Xavier Noria | 2012-10-09 | 3 | -3/+5 |
| | * | | 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 | 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 |
| | |\ \ \ |
|
| | | * | | | 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 | 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 |
| | * | | | Merge pull request #7736 from gregolsen/beginning_of_week_guides | Xavier Noria | 2012-10-09 | 1 | -2/+6 |
| | |\ \ \ |
|
| | | * | | | 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 | 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 | claudiob | 2012-10-08 | 2 | -2/+2 |
| | |/ / / / |
|
| | * | | | | 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 | Yves Senn | 2012-10-08 | 1 | -17/+0 |
| | |/ / / / |
|
| | * | | | | 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. | Steve Klabnik | 2012-10-08 | 2 | -8/+7 |
| * | | | | | | There is already an invitation to use rack-cache in config/environments/produ... | David Heinemeier Hansson | 2012-10-08 | 1 | -3/+0 |
| |/ / / / / |
|
| * | | | | | 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 |
| * | | | | Everyone is running bundler, no need for defensive programming shit | David Heinemeier Hansson | 2012-10-08 | 1 | -2/+2 |
| * | | | | Not precompiling your assets for production is a bad idea -- do not encourage it | David Heinemeier Hansson | 2012-10-08 | 1 | -6/+2 |
| * | | | | Merge pull request #7872 from kennyj/should_use_app_paths | José Valim | 2012-10-08 | 1 | -1/+2 |
| |\ \ \ \ |
|
| | * | | | | Should use app.paths instead of specific path. | kennyj | 2012-10-08 | 1 | -1/+2 |
| |/ / / / |
|
| * | | | | Merge pull request #6282 from alexeymuranov/rename-fixtures-class | Rafael Mendonça França | 2012-10-07 | 14 | -63/+83 |
| |\ \ \ \ |
|
| | * | | | | Add CHANGELOG entry for "Fixtures" -> "FixtureSet" | Alexey Muranov | 2012-10-07 | 1 | -1/+13 |
| | * | | | | Move/rename files to follow naming conventions | Alexey Muranov | 2012-10-07 | 3 | -1/+1 |
| | * | | | | Deprecate "Fixtures" constant | Alexey Muranov | 2012-10-07 | 1 | -0/+8 |
| | * | | | | Rename "Fixtures" class to "FixtureSet" | Alexey Muranov | 2012-10-07 | 13 | -61/+61 |
