aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-163-18/+83
|\
| * minor edits in getting started guideVijay Dev2012-01-161-2/+2
| |
| * copy editing asset pipeline changesVijay Dev2012-01-161-7/+6
| |
| * [docs] Update pipeline asset organization section.Richard Hulse2012-01-161-4/+57
| | | | | | | | | | * Calified how assets are included. * Added information about using index manifests.
| * change class to id per scaffold changeDan Pickett2012-01-151-7/+7
| | | | | | #4472
| * Improve description of :allow_destroy option for nested attributes in ↵Carlos Antonio da Silva2012-01-151-7/+7
| | | | | | | | getting started guide
| * Fix styling of example layout. Fixes #4461Jason Noble2012-01-131-1/+1
| |
| * Mention how use config.assets.prefix to avoid conflicting with an existing ↵Guillermo Iguaran2012-01-131-1/+8
| | | | | | | | "/assets" route
| * Getting Started Guide: Update reference about JavaScript runtimesGuillermo Iguaran2012-01-131-1/+7
| |
* | Add ActiveModel::Errors#delete, which was not available after move to use ↵Piotr Sarnacki2012-01-162-0/+12
| | | | | | | | delegation
* | Merge pull request #4480 from lest/use-rack-body-proxyJosé Valim2012-01-1610-135/+44
|\ \ | | | | | | Use Rack::BodyProxy
| * | use rack from master branchSergey Nartimov2012-01-162-0/+4
| | | | | | | | | | | | | | | it's needed until new rack release with Rack::BodyProxy fixes https://github.com/rack/rack/commit/b06ef82876416fe69429f7d3ee6e51bf26aec75f
| * | use Rack::BodyProxy in activerecord middlewaresSergey Nartimov2012-01-166-102/+37
| | |
| * | use Rack::BodyProxy in AD::ReloaderSergey Nartimov2012-01-162-33/+3
| | |
* | | Merge pull request #4478 from amatsuda/rake_stats_mailerJosé Valim2012-01-161-0/+1
|\ \ \ | | | | | | | | show stats for app/mailers
| * | | show stats for app/mailersAkira Matsuda2012-01-161-0/+1
|/ / /
* | | Try to create schema migrations table in schema dumper testPiotr Sarnacki2012-01-161-0/+5
| | |
* | | Fix ActiveRecord mysql testsPiotr Sarnacki2012-01-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | TL;DR: MySQL sucks. Since it does not support transactions for schema changes, when you run `create_table` in setup block, it will commit current transaction. Now tests want to run `RELEASE SAVEPOINT` after finishing tests which fails since there is no transaction.
* | | Fix test class name that should read WithoutCarlos Antonio da Silva2012-01-161-2/+2
|/ /
* | Fix railties testsPiotr Sarnacki2012-01-151-4/+4
| | | | | | | | | | SchemaMigration model is loaded on rails initialization, which means that it will not be cleaned on each request.
* | Fix stack level too deep when model does not have attributes method.Piotr Sarnacki2012-01-152-1/+9
| | | | | | | | | | | | | | | | | | | | | | Without that patch when using ActiveModel::AttributeMethods in a class that does not respond to `attributes` method, stack level too deep error will be raised on non existing method. While documentation is clear that you need to define `attributes` method in order to use AttributeMethods module, `stack level too deep` is rather obscure and hard to debug, therefore we should try to not break `method_missing` if someone forgets about defining `attributes`.
* | fix a broken testVijay Dev2012-01-151-1/+1
| | | | | | | | | | | | The commit 2f632f53919d2b44dbb2cfaadabed2310319f005 extracted the options into constants and while doing so, there was a minor error of using a wrong constant name.
* | Merge pull request #4467 from castlerock/changelog_for_deprecatedVijay Dev2012-01-151-0/+17
|\ \ | | | | | | changelog entry for deprecated ActionController::Integration, ActionCont...
| * | changelog entry for deprecated ActionController::Integration, ↵Vishnu Atrai2012-01-151-0/+17
| | | | | | | | | | | | ActionController::IntegrationTest, ActionController::PerformanceTest,ActionController::AbstractRequest, ActionController::Request, ActionController::AbstractResponse others
* | | Upgrade mail dependency to 2.4.0Mikel Lindsaar2012-01-151-1/+1
| | |
* | | Merge pull request #4469 from ↵José Valim2012-01-152-1/+15
|\ \ \ | | | | | | | | | | | | | | | | guilleiguaran/fix-skipping-assets-in-route-inspector Don't hardcode assets route skipped in route inspector
| * | | Don't hardcode assets route skipped in route inspectorGuillermo Iguaran2012-01-142-1/+15
| |/ /
* | | Merge pull request #4468 from guilleiguaran/bump-sprockets-2-2José Valim2012-01-151-1/+1
|\ \ \ | | | | | | | | Bump Sprockets to 2.2.0 in master
| * | | Bump Sprockets to 2.2.0Guillermo Iguaran2012-01-141-1/+1
| |/ /
* | | Merge pull request #4470 from ndbroadbent/small_refactoringJosé Valim2012-01-151-13/+2
|\ \ \ | | | | | | | | Refactored watchable_args and build_original_fullpath methods in Rails::Application
| * | | Refactored watchable_args and build_original_fullpath methods in ↵Nathan Broadbent2012-01-151-13/+2
|/ / / | | | | | | | | | railties/lib/rails/application.rb
* | | Merge pull request #4466 from carlosantoniodasilva/generated-attributes-refactorJosé Valim2012-01-142-10/+9
|\ \ \ | |/ / |/| | Generated attributes refactor
| * | Delegate clear_active_connections to handler as wellCarlos Antonio da Silva2012-01-141-6/+2
| | |
| * | Extract index and uniq index options to constantsCarlos Antonio da Silva2012-01-141-4/+7
|/ /
* | Merge pull request #4398 from castlerock/remove_deprecatedJosé Valim2012-01-143-1/+10
|\ \ | | | | | | deprecated action_controller integration test and performance test
| * | Deprecate ActionController::Integration, ActionController::IntegrationTest, ↵Vishnu Atrai2012-01-153-1/+10
|/ / | | | | | | ActionController::PerformanceTest,ActionController::AbstractRequest, ActionController::Request, ActionController::AbstractResponse, ActionController::Response and ActionController::Routing
* | Merge pull request #4463 from nashby/refactor-response_bodyJosé Valim2012-01-141-7/+1
|\ \ | | | | | | refactor response_body= method
| * | refactor response_body= methodVasiliy Ermolovich2012-01-141-7/+1
|/ / | | | | | | response_to?(:each) returns false for strings in ruby 1.9, so there is no need for these checks
* | Add begin/ensure block since we are returning.José Valim2012-01-141-3/+5
| |
* | make sure the migration table is alive and emptyAaron Patterson2012-01-132-2/+12
| |
* | refactor schema migration table creation to the schema migration modelAaron Patterson2012-01-134-10/+21
| |
* | Fix race condition :bomb:Jon Leighton2012-01-131-4/+11
| |
* | stop depending on the filesystem for interleaved migration testsAaron Patterson2012-01-138-84/+49
| |
* | convert the migration list to a Set, remove duplicate codeAaron Patterson2012-01-132-16/+18
| |
* | deprecate the block argument to Migrator#migrateAaron Patterson2012-01-131-8/+19
| |
* | refactor the migrate method to filter migrations before running themAaron Patterson2012-01-132-26/+33
| |
* | move schema dumper tests to the correct classAaron Patterson2012-01-132-9/+10
| |
* | use the schema migration model to dump schema infoAaron Patterson2012-01-132-3/+8
| |
* | move another migrator test, use schema migration modelAaron Patterson2012-01-132-10/+9
| |
* | use the model to delete recordsAaron Patterson2012-01-131-4/+1
| |