aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #7908 from arunagw/build_fix_railtiesRafael Mendonça França2012-10-111-5/+0
|\ \ \ \ \ | |/ / / / |/| | | | No need to test for rack-cache present in gem file
| * | | | No need to test for rack-cache present in GemfileArun Agrawal2012-10-111-5/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | as it's removed here 1fc795468525d8622cdca474a54c8310a514aa46
* | | | Merge pull request #7050 from kytrinyx/documentation-reset-column-infoVijay Dev2012-10-101-0/+21
|\ \ \ \ | | | | | | | | | | Expand the caveat about models in migrations in the rails guide.
| * | | | Expand caveat about models in migrations (rails guide)Katrina Owen2012-10-101-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 referencing the model. Explicitly calling `reset_column_information` is a more reliable workaround.
* | | | | Merge pull request #7904 from jfirebaugh/eager_autoloadRafael Mendonça França2012-10-101-10/+14
|\ \ \ \ \ | | | | | | | | | | | | Eager autoload Preloader classes
| * | | | | Eager autoload Preloader classesJohn Firebaugh2012-10-101-10/+14
|/ / / / / | | | | | | | | | | | | | | | | | | | | Without eager autoloading, these would be autoloaded only when #preloader_for is called, which is too late in threaded applications.
* | | | | Remove the leading :: constant qualifier in the ActiveRecord::Fixtures ↵Jeremy Kemper2012-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | deprecation message
* | | | | Upgrade to a jquery-rails that doesn't expect ↵Jeremy Kemper2012-10-101-1/+1
|/ / / / | | | | | | | | | | | | config.action_view.javascript_expansions to exist
* | | | Merge pull request #7887 from senny/remove_unused_requires_in_ar_testsVijay Dev2012-10-104-4/+0
|\ \ \ \ | | | | | | | | | | remove duplicated require statements in AR test cases
| * | | | remove duplicated require statements in AR test casesYves Senn2012-10-094-4/+0
| | | | |
* | | | | Fixing build failuresVijay Dev2012-10-116-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge pull request #7898 from olivierlacan/pg_homebrew_instructionsVijay Dev2012-10-101-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Offer instructions for pg gem when installed via Homebrew
| * | | | | Offer instructions for pg gem when installed via HomebrewOlivier Lacan2012-10-101-1/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #7890 from AvnerCohen/new_hash_syntaxVijay Dev2012-10-101-9/+9
|\ \ \ \ \ | | | | | | | | | | | | Moving to new hash syntax
| * | | | | moving to new hash syntax, for discussion before I take the time on full foldersAvnerCohen2012-10-091-9/+9
| | | | | |
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-1165-252/+336
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
| * | | | | | copy edits [ci skip]Vijay Dev2012-10-112-4/+4
| | | | | | |
| * | | | | | copy-edit the email delivery errors commentVijay Dev2012-10-111-1/+1
| | | | | | |
| * | | | | | Revert "Fix Example in active model attribute methods"Vijay Dev2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1c02b988641c201308e6b3de6457128878e47bd5.
| * | | | | | Revert "Fix all examples in comments in active_model attribute methods"Vijay Dev2012-10-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 93b1ca8bd34993f8958219f13c195f5acf8e55f6.
| * | | | | | Added clarity to update_column(s)Adam Haymond2012-10-101-2/+2
| | | | | | |
| * | | | | | migrating guides to new hash syntaxAvnerCohen2012-10-103-68/+68
| | | | | | |
| * | | | | | Use a 1.9 Hash syntax in README files (fixes thanks to @vijaydev)Robin Dupret2012-10-102-9/+9
| | | | | | |
| * | | | | | Revert "Add changelog/release note entries for missing ActionMailer super ↵Aditya Sanghi2012-10-102-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature related to inclusion of callbacks in mailers" This reverts commit f16ec8c864ba12c2315713af76b11be5887cfa3a.
| * | | | | | Add changelog/release note entries for missing ActionMailer super feature ↵Aditya Sanghi2012-10-102-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | related to inclusion of callbacks in mailers
| * | | | | | gradually moving documentation to new hash syntaxAvnerCohen2012-10-102-2/+2
| | | | | | |
| * | | | | | Fixed unclosing tagAvnerCohen2012-10-091-1/+1
| | | | | | |
| * | | | | | updating i18n guide with locale config location.Steve Klabnik2012-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This changed in rails/rails#43e14f8
| * | | | | | Fix typo: 'this also mean' -> 'this also means'Jeffrey Hardy2012-10-081-1/+1
| | | | | | |
| * | | | | | Closed unclosed <tt>, working on a complete solution for docrails, but ↵AvnerCohen2012-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | testing push process first
| * | | | | | Fix missing typewriter tagLincoln Lee2012-10-081-1/+1
| | | | | | |
| * | | | | | Correct and clarify `--full` and `--mountable` options to `rails plugin new`Corey Innis2012-10-071-4/+43
| | | | | | |
| * | | | | | update Rails::Generators docs [ci skip]Francesco Rodriguez2012-10-0722-43/+35
| | | | | | |
| * | | | | | nodoc JS::Generators [ci skip]Francesco Rodriguez2012-10-071-3/+3
| | | | | | |
| * | | | | | nodoc Erb::Generators [ci skip]Francesco Rodriguez2012-10-074-11/+11
| | | | | | |
| * | | | | | nodoc CSS::Generators [ci skip]Francesco Rodriguez2012-10-072-6/+6
| | | | | | |
| * | | | | | nodoc TestUnit::Generators [ci skip]Francesco Rodriguez2012-10-0710-30/+30
| | | | | | |
| * | | | | | Update ↵Adrien Lamothe2012-10-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
| * | | | | | Update guides/source/action_mailer_basics.mdAdrien Lamothe2012-10-061-1/+1
| | | | | | |
| * | | | | | add AC::Parameters#permit_all_parameters config option [ci skip]Francesco Rodriguez2012-10-051-1/+3
| | | | | | |
| * | | | | | remove old AR Mass Assignment config options [ci skip]Francesco Rodriguez2012-10-051-4/+0
| | | | | | |
| * | | | | | Merge pull request #115 from ruggeri/masterFrancesco Rodríguez2012-10-051-2/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove non sequitur NOTE on :include [ci skip]
| | * | | | | | remove non sequitur NOTE on :includeNed Ruggeri2012-10-011-2/+0
| | | | | | | |
| * | | | | | | delete removed page cache options [ci skip]Francesco Rodriguez2012-10-051-10/+2
| | | | | | | |
| * | | | | | | use default_static_extension instead of page_cache_extension deprecated ↵Francesco Rodriguez2012-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option [ci skip]
| * | | | | | | update caching with rails guide to reflect action and page extraction [ci skip]Francesco Rodriguez2012-10-051-5/+8
| | | | | | | |
| * | | | | | | Add CollectionAssociation#destroy to ActiveRecord::Association::ClassMethods ↵Samuel Cochran2012-10-051-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code docs
| * | | | | | | Add CollectionAssociation#destroy to association guideSamuel Cochran2012-10-051-0/+23
| | | | | | | |
| * | | | | | | Merge pull request #116 from jarednipper/masterJared Nipper2012-10-031-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed two typos in the testing guide
| | * | | | | | | Fixed typo in command to run unit testJared Nipper2012-10-011-1/+1
| | | | | | | | |