aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix github url [ci skip]Vijay Dev2012-10-111-1/+1
* Merge pull request #7902 from josh/fix-bug-in-as-cache-upgradeDavid Heinemeier Hansson2012-10-101-1/+1
|\
| * Ensure expires_in and created_at timestamps aren't nil when attempting to upg...Joshua Peek2012-10-101-1/+1
|/
* Add changelog entry for killing the asset tag concatenationDavid Heinemeier Hansson2012-10-101-0/+2
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2012-10-1060-1349/+266
|\
| * Merge pull request #7900 from josh/kill-old-asset-tag-helper-concatDavid Heinemeier Hansson2012-10-105-1132/+16
| |\
| | * Remove expansion configJoshua Peek2012-10-101-2/+0
| | * Remove old asset tag concatenationJoshua Peek2012-10-105-1130/+16
| |/
| * Merge pull request #7899 from asanghi/masterVijay Dev2012-10-102-0/+6
| |\
| | * Add missing CHANGELOG related to addition of callbacks to mailers.Aditya Sanghi2012-10-102-0/+6
| * | Merge pull request #7897 from arunagw/warning_fixes_assert_matchVijay Dev2012-10-101-7/+7
| |\ \ | | |/ | |/|
| | * warning fixed: ambiguous first argument; put parentheses or even spacesArun Agrawal2012-10-101-7/+7
| * | Merge pull request #7895 from mdaisuke/guides_typoVijay Dev2012-10-091-1/+1
| |\ \ | | |/ | |/|
| | * fix typo in "The Rails Initialization Process"mdaisuke2012-10-101-1/+1
| * | Merge pull request #7859 from ernie/fix-collection-associations-with-selectAaron Patterson2012-10-092-1/+9
| |\ \ | | |/ | |/|
| | * Fix has_many assocation w/select load after createErnie Miller2012-10-052-1/+9
| * | Merge pull request #7878 from blowmage/test_locationsJeremy Kemper2012-10-0934-146/+187
| |\ \
| | * | Update test locationsMike Moore2012-10-0934-146/+187
| |/ /
| * | let (array|hash)/conversions.rb load the extensions in object/to_(param|query...Xavier Noria2012-10-093-3/+5
| * | adds a missing requireXavier Noria2012-10-091-0/+1
| * | Merge pull request #7885 from guilleiguaran/railties-changelogRafael Mendonça França2012-10-091-2/+7
| |\ \
| | * | Add missing entry in CHANGELOG about config.assets.cache changeGuillermo Iguaran2012-10-091-2/+7
| * | | Merge pull request #7883 from guilleiguaran/refactor-assets-testRafael Mendonça França2012-10-092-16/+1
| |\ \ \
| | * | | Remove duplicated testGuillermo Iguaran2012-10-091-15/+0
| | * | | Minor test refactoring: Use add_to_env instead of an initializerGuillermo Iguaran2012-10-091-1/+1
| | |/ /
| * | | adds missing requireXavier Noria2012-10-091-0/+1
| * | | Merge pull request #7881 from guilleiguaran/fix-initializerRafael Mendonça França2012-10-091-3/+3
| |\ \ \
| | * | | Rails.config doesn't exist, it should be Rails.application.config insteadGuillermo Iguaran2012-10-091-3/+3
| | |/ /
| * | | copy-edits ae9b3d7 [ci skip]Xavier Noria2012-10-091-2/+3
| * | | AS guide: revises the description of #monday, and #sunday [ci skip]Xavier Noria2012-10-091-2/+8
| * | | Merge pull request #7736 from gregolsen/beginning_of_week_guidesXavier Noria2012-10-091-2/+6
| |\ \ \
| | * | | active support core extensions guides updated with config.beginning_of_week infogregolsen2012-09-221-2/+6
| * | | | keys.include? -> key?Xavier Noria2012-10-091-1/+1
| * | | | Merge pull request #7817 from NARKOZ/object-conversionsXavier Noria2012-10-094-11/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | remove unnecessary object/conversions fileNihad Abbasov2012-10-024-11/+2
| * | | | Merge pull request #7877 from claudiob/remove_duplicate_article_THERafael Mendonça França2012-10-082-2/+2
| |\ \ \ \
| | * | | | Remove duplicate 'the' article in commented lineclaudiob2012-10-082-2/+2
| |/ / / /
| * | | | Merge pull request #7875 from senny/interpolation_for_executeRafael Mendonça França2012-10-081-17/+0
| |\ \ \ \
| | * | | | remove unused `expand_range_bind_variables` methodYves Senn2012-10-081-17/+0
| |/ / / /
| * | | | Merge pull request #7873 from steveklabnik/update_initializerDavid Heinemeier Hansson2012-10-082-8/+7
| |\ \ \ \
| | * | | | Moving locale stuff from app.rb to an initializer.Steve Klabnik2012-10-082-8/+7
* | | | | | There is already an invitation to use rack-cache in config/environments/produ...David Heinemeier Hansson2012-10-081-3/+0
|/ / / / /
* | | | | Cleanup comments a bit and fuck 80 charactersDavid Heinemeier Hansson2012-10-081-16/+10
* | | | | Inline commentDavid Heinemeier Hansson2012-10-081-3/+1
|/ / / /
* | | | Encoding already defaults to utf-8 per lib/rails/application/configuration.rb:23David Heinemeier Hansson2012-10-081-3/+0
* | | | Everyone is running bundler, no need for defensive programming shitDavid Heinemeier Hansson2012-10-081-2/+2
* | | | Not precompiling your assets for production is a bad idea -- do not encourage itDavid Heinemeier Hansson2012-10-081-6/+2
* | | | Merge pull request #7872 from kennyj/should_use_app_pathsJosé Valim2012-10-081-1/+2
|\ \ \ \
| * | | | Should use app.paths instead of specific path.kennyj2012-10-081-1/+2
|/ / / /
* | | | Merge pull request #6282 from alexeymuranov/rename-fixtures-classRafael Mendonça França2012-10-0714-63/+83
|\ \ \ \