Commits

Author Commit Message Labels Comments Date
Katrina Owen
Expand caveat about models in migrations (rails guide) This is an attempt to address issue #6939, where an earlier migration added a column to the database, and a later migration uses a model and references that column. When both migrations were run together with `rake db:migrate` the column information in memory still referenced the old table structure. Running the migrations separately fixed this, as a new connection was then established before re…
Vijay Dev
Merge pull request #7887 from senny/remove_unused_requires_in_ar_tests remove duplicated require statements in AR test cases
Vijay Dev
Fixing build failures Build failed with an error "invalid multibyte char (US-ASCII)" in these files. Apparently, some UTF-8 char disguised as whitespace causes this. Thanks @rafaelfranca
Vijay Dev
Merge pull request #7898 from olivierlacan/pg_homebrew_instructions Offer instructions for pg gem when installed via Homebrew
Vijay Dev
Merge pull request #7890 from AvnerCohen/new_hash_syntax Moving to new hash syntax
Vijay Dev
Merge branch 'master' of github.com:lifo/docrails Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
Vijay Dev
fix github url [ci skip]
Vijay Dev
copy edits [ci skip]
Vijay Dev
copy-edit the email delivery errors comment
Vijay Dev
Revert "Fix Example in active model attribute methods" This reverts commit 1c02b988641c201308e6b3de6457128878e47bd5.
Vijay Dev
Revert "Fix all examples in comments in active_model attribute methods" This reverts commit 93b1ca8bd34993f8958219f13c195f5acf8e55f6.
David Heinemeier Hansson
Merge pull request #7902 from josh/fix-bug-in-as-cache-upgrade Fix AS::Cache version upgrading bug
Joshua Peek
Ensure expires_in and created_at timestamps aren't nil when attempting to upgrade cache
David Heinemeier Hansson
Add changelog entry for killing the asset tag concatenation
David Heinemeier Hansson
Merge branch 'master' of github.com:rails/rails
David Heinemeier Hansson
Merge pull request #7900 from josh/kill-old-asset-tag-helper-concat Remove old asset tag concatenation
Joshua Peek
Remove expansion config
Adam Haymond
Added clarity to update_column(s)
Joshua Peek
Remove old asset tag concatenation Use sprockets, jammit, or some other asset bundler
Olivier Lacan
Offer instructions for pg gem when installed via Homebrew
Avner Cohen
migrating guides to new hash syntax
robin850
Use a 1.9 Hash syntax in README files (fixes thanks to @vijaydev)
Vijay Dev
Merge pull request #7899 from asanghi/master Add missing CHANGELOG relating to addition of callbacks to mailers
Aditya Sanghi
Add missing CHANGELOG related to addition of callbacks to mailers.
Aditya Sanghi
Revert "Add changelog/release note entries for missing ActionMailer super feature related to inclusion of callbacks in mailers" This reverts commit f16ec8c864ba12c2315713af76b11be5887cfa3a.
Aditya Sanghi
Add changelog/release note entries for missing ActionMailer super feature related to inclusion of callbacks in mailers
Vijay Dev
Merge pull request #7897 from arunagw/warning_fixes_assert_match warning fixed: ambiguous first argument; put parentheses or even spaces
Avner Cohen
gradually moving documentation to new hash syntax
Arun Agrawal
warning fixed: ambiguous first argument; put parentheses or even spaces
Vijay Dev
Merge pull request #7895 from mdaisuke/guides_typo fix typo in "The Rails Initialization Process"
  1. Prev
  2. Next