aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-027-196/+211
|\ | | | | | | | | | | | | | | Conflicts: activemodel/README activemodel/lib/active_model/errors.rb activemodel/lib/active_model/serialization.rb railties/guides/source/3_0_release_notes.textile
| * Fixed --dev flag for new bundlerMikel Lindsaar2010-02-023-5/+5
| |
| * Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-0215-60/+84
| |\
| * | Xavier's editsMikel Lindsaar2010-02-021-42/+43
| | |
| * | Adding Release Notes 3.0Mikel Lindsaar2010-02-011-0/+487
| | |
| * | Updates to output and warning on being for Rails 3.0Mikel Lindsaar2010-02-011-12/+20
| | |
| * | Completely updated the ActionMailer guideMikel Lindsaar2010-02-011-184/+189
| | |
| * | Updating copyright dates on all licensesMikel Lindsaar2010-02-012-2/+2
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsMikel Lindsaar2010-02-0220-74/+127
|\ \ \
| * | | update html_safe calls in guides generationXavier Noria2010-02-022-11/+5
| | | |
| * | | Merge remote branch 'mainstream/master'Pratik Naik2010-02-0117-62/+86
| |\ \ \ | | | |/ | | |/|
| | * | Add the database adapter in the generated GemfileCarl Lerche2010-02-012-0/+20
| | | |
| | * | Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-02-011-3/+4
| | |\ \
| | | * | Convert to class_attributeJeremy Kemper2010-02-011-3/+4
| | | | |
| | * | | Deprecate AC configuration values which were moved to Rack.José Valim2010-02-016-11/+19
| | | | |
| | * | | Add config.generators.fallbacks.José Valim2010-02-013-2/+15
| | |/ /
| | * | Update the generated Gemfile and config/boot.rb to work with bundler 0.9Carl Lerche2010-01-312-11/+16
| | | |
| | * | Get rails tests running on bundler 0.9Carl Lerche2010-01-313-33/+10
| | |/
| | * deOMGifying Railties, Active Support, and Action PackMikel Lindsaar2010-01-312-2/+2
| | |
| * | AS guide: documents Class#class_attributeXavier Noria2010-02-021-1/+36
| | |
* | | Updating install docsMikel Lindsaar2010-02-021-4/+8
|/ /
* | Adding in I18n sectionMikel Lindsaar2010-02-021-0/+45
| |
* | Adding in rake task updates and extra data on postgres and oracle fixesMikel Lindsaar2010-02-021-1/+7
| |
* | Adding extra points from crowd sourcingMikel Lindsaar2010-02-021-0/+11
| |
* | dumps the current 3.0 release notes draftXavier Noria2010-02-011-9/+446
| |
* | Fix some typo that I forgot to remote 'map.'Prem Sichanugrist2010-02-011-1/+1
| |
* | Modify the documentation for routing to add the new DSL format of Rails 3Prem Sichanugrist2010-02-011-101/+105
| |
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-3117-751/+159
|\| | | | | | | | | Conflicts: activemodel/lib/active_model/state_machine.rb
| * Include prototype ujs adapter with new appsJoshua Peek2010-01-302-0/+81
| |
| * Revert "Merge branch 'rails/master' into ujs"Joshua Peek2010-01-303-715/+0
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 3aa1ea1ae4baa4a03d03644e798eeb98a4745785, reversing changes made to 2c12a71378d2146c822acb389b00b866f6420ff5. Conflicts: actionpack/lib/action_view/helpers/javascript_helper.rb actionpack/lib/action_view/helpers/url_helper.rb actionpack/test/template/url_helper_test.rb
| * Revert "Drop JS scripts from core"Joshua Peek2010-01-308-3/+8104
| | | | | | | | This reverts commit a06c47a52b90a5d812e64309488ad5926dc583ca.
| * Improve railtie deprecation messages.José Valim2010-01-302-10/+17
| |
| * tsort-based dependency resolution for initializersPaul Rosania2010-01-294-21/+55
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Drop JS scripts from coreJoshua Peek2010-01-298-8104/+3
| |
| * Only load testing tasks if test unit is being used.José Valim2010-01-292-2/+2
| |
| * Automatically configure generators if application is defined.José Valim2010-01-294-3/+4
| |
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-28133-2045/+2983
|\| | | | | | | | | Conflicts: railties/lib/rails/railtie.rb
| * Move the ActiveRecord generator settings into the RailtieCarl Lerche2010-01-284-7/+4
| |
| * Add more tests to some key points in Railties.José Valim2010-01-2810-130/+190
| | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
| * Add reloadable specific for engines and move environment to application paths.José Valim2010-01-288-11/+23
| | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
| * Add config.to_prepare back and add tests for it.José Valim2010-01-283-1/+38
| | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
| * Refactor MetalLoader and RoutesReloader to rely less on class configuration.José Valim2010-01-286-35/+40
| | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
| * Cleanup the test_unit generator move into the railtieCarl Lerche2010-01-282-8/+9
| |
| * Fix the test_framework generator testsCarl Lerche2010-01-283-1/+4
| |
| * Test::Unit Railtie Carlhuda2010-01-286-5/+23
| |
| * Merge branch 'rails/master' into ujsStefan Penner2010-01-272-6/+7
| |\
| | * Missed template change for defaults -> defaultJeremy Kemper2010-01-271-1/+1
| | |
| | * Rename 'defaults' class method to 'default' to reflect that it's a declarationJeremy Kemper2010-01-271-1/+1
| | |
| | * Attend to brittle mailer generator testsJeremy Kemper2010-01-271-3/+3
| | |
| | * self.defaults => defaultJeremy Kemper2010-01-271-3/+4
| | |