aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | instructions for running migrations in another ENVschneems2012-10-021-1/+9
| | | | | | | |
| * | | | | | | Add /rails/info/routes method to getting_startedschneems2012-10-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix # to $ for `rake routes` command
| * | | | | | | explain how to check if the server has returned on *nix systems in ↵schneems2012-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getting_started guide
| * | | | | | | Explain that command line commands have $schneems2012-10-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was extremely confusing to new programmers, also different operating systems call the command line something different
| * | | | | | | change `#` to `$` in bash sectionschneems2012-10-021-1/+1
| | | | | | | |
| * | | | | | | Space between "every" and "time"schneems2012-10-021-1/+1
| | | | | | | |
| * | | | | | | use <url> markdown syntax instead of [url](url) [ci skip]Francesco Rodriguez2012-10-011-13/+13
| | | | | | | |
| * | | | | | | Fix truncated line in the i18n edge guideVictor Costan2012-10-011-1/+1
| |/ / / / / /
| * | | | | | fix example in Migration docs [ci skip]Francesco Rodriguez2012-09-301-1/+1
| | | | | | |
| * | | | | | add change_table transformation to Migration docs [ci skip]Francesco Rodriguez2012-09-301-16/+19
| | | | | | |
| * | | | | | updates latest Rails version numberFabrizio Regini2012-09-301-1/+1
| | | | | | |
| * | | | | | Make strong_parameters example simplerGuillermo Iguaran2012-09-301-4/+5
| | | | | | |
* | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix AS::Cache version upgrading bug
| * | | | | | | Ensure expires_in and created_at timestamps aren't nil when attempting to ↵Joshua Peek2012-10-101-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | upgrade cache
* | | | | | | 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 old asset tag concatenation
| | * | | | | | | Remove expansion configJoshua Peek2012-10-101-2/+0
| | | | | | | | |
| | * | | | | | | Remove old asset tag concatenationJoshua Peek2012-10-105-1130/+16
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Use sprockets, jammit, or some other asset bundler
| * | | | | | | Merge pull request #7899 from asanghi/masterVijay Dev2012-10-102-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add missing CHANGELOG relating to addition of callbacks to mailers
| | * | | | | | | 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 spaces
| | * | | | | | 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"
| | * | | | | | 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 create
| | * | | | | | Fix has_many assocation w/select load after createErnie Miller2012-10-052-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_locationsJeremy Kemper2012-10-0934-146/+187
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | Update test names and locations
| | * | | | | | Update test locationsMike Moore2012-10-0934-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 Noria2012-10-093-3/+5
| | |_|/ / / | |/| | | | | | | | | | | | | | | | object/to_(param|query).rb
| * | | | | 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 change
| | * | | | | 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
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Minor refactors in assets test
| | * | | | | 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 instead
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_guidesXavier Noria2012-10-091-2/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | ActiveSupport core extensions guides update
| | * | | | | 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 file
| | * | | | | 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 line
| | * | | | | | Remove duplicate 'the' article in commented lineclaudiob2012-10-082-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | The sentence used to read "at the bottom of the the compiled file"
| * | | | | | Merge pull request #7875 from senny/interpolation_for_executeRafael Mendonça França2012-10-081-17/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | remove unused `expand_range_bind_variables` method
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 08:06:20 +0000