Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-01-16 | 3 | -18/+83 |
|\ | |||||
| * | minor edits in getting started guide | Vijay Dev | 2012-01-16 | 1 | -2/+2 |
| | | |||||
| * | copy editing asset pipeline changes | Vijay Dev | 2012-01-16 | 1 | -7/+6 |
| | | |||||
| * | [docs] Update pipeline asset organization section. | Richard Hulse | 2012-01-16 | 1 | -4/+57 |
| | | | | | | | | | | * Calified how assets are included. * Added information about using index manifests. | ||||
| * | change class to id per scaffold change | Dan Pickett | 2012-01-15 | 1 | -7/+7 |
| | | | | | | #4472 | ||||
| * | Improve description of :allow_destroy option for nested attributes in ↵ | Carlos Antonio da Silva | 2012-01-15 | 1 | -7/+7 |
| | | | | | | | | getting started guide | ||||
| * | Fix styling of example layout. Fixes #4461 | Jason Noble | 2012-01-13 | 1 | -1/+1 |
| | | |||||
| * | Mention how use config.assets.prefix to avoid conflicting with an existing ↵ | Guillermo Iguaran | 2012-01-13 | 1 | -1/+8 |
| | | | | | | | | "/assets" route | ||||
| * | Getting Started Guide: Update reference about JavaScript runtimes | Guillermo Iguaran | 2012-01-13 | 1 | -1/+7 |
| | | |||||
* | | Add ActiveModel::Errors#delete, which was not available after move to use ↵ | Piotr Sarnacki | 2012-01-16 | 2 | -0/+12 |
| | | | | | | | | delegation | ||||
* | | Merge pull request #4480 from lest/use-rack-body-proxy | José Valim | 2012-01-16 | 10 | -135/+44 |
|\ \ | | | | | | | Use Rack::BodyProxy | ||||
| * | | use rack from master branch | Sergey Nartimov | 2012-01-16 | 2 | -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 middlewares | Sergey Nartimov | 2012-01-16 | 6 | -102/+37 |
| | | | |||||
| * | | use Rack::BodyProxy in AD::Reloader | Sergey Nartimov | 2012-01-16 | 2 | -33/+3 |
| | | | |||||
* | | | Merge pull request #4478 from amatsuda/rake_stats_mailer | José Valim | 2012-01-16 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | show stats for app/mailers | ||||
| * | | | show stats for app/mailers | Akira Matsuda | 2012-01-16 | 1 | -0/+1 |
|/ / / | |||||
* | | | Try to create schema migrations table in schema dumper test | Piotr Sarnacki | 2012-01-16 | 1 | -0/+5 |
| | | | |||||
* | | | Fix ActiveRecord mysql tests | Piotr Sarnacki | 2012-01-16 | 1 | -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 Without | Carlos Antonio da Silva | 2012-01-16 | 1 | -2/+2 |
|/ / | |||||
* | | Fix railties tests | Piotr Sarnacki | 2012-01-15 | 1 | -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 Sarnacki | 2012-01-15 | 2 | -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 test | Vijay Dev | 2012-01-15 | 1 | -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_deprecated | Vijay Dev | 2012-01-15 | 1 | -0/+17 |
|\ \ | | | | | | | changelog entry for deprecated ActionController::Integration, ActionCont... | ||||
| * | | changelog entry for deprecated ActionController::Integration, ↵ | Vishnu Atrai | 2012-01-15 | 1 | -0/+17 |
| | | | | | | | | | | | | ActionController::IntegrationTest, ActionController::PerformanceTest,ActionController::AbstractRequest, ActionController::Request, ActionController::AbstractResponse others | ||||
* | | | Upgrade mail dependency to 2.4.0 | Mikel Lindsaar | 2012-01-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #4469 from ↵ | José Valim | 2012-01-15 | 2 | -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 inspector | Guillermo Iguaran | 2012-01-14 | 2 | -1/+15 |
| |/ / | |||||
* | | | Merge pull request #4468 from guilleiguaran/bump-sprockets-2-2 | José Valim | 2012-01-15 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Bump Sprockets to 2.2.0 in master | ||||
| * | | | Bump Sprockets to 2.2.0 | Guillermo Iguaran | 2012-01-14 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #4470 from ndbroadbent/small_refactoring | José Valim | 2012-01-15 | 1 | -13/+2 |
|\ \ \ | | | | | | | | | Refactored watchable_args and build_original_fullpath methods in Rails::Application | ||||
| * | | | Refactored watchable_args and build_original_fullpath methods in ↵ | Nathan Broadbent | 2012-01-15 | 1 | -13/+2 |
|/ / / | | | | | | | | | | railties/lib/rails/application.rb | ||||
* | | | Merge pull request #4466 from carlosantoniodasilva/generated-attributes-refactor | José Valim | 2012-01-14 | 2 | -10/+9 |
|\ \ \ | |/ / |/| | | Generated attributes refactor | ||||
| * | | Delegate clear_active_connections to handler as well | Carlos Antonio da Silva | 2012-01-14 | 1 | -6/+2 |
| | | | |||||
| * | | Extract index and uniq index options to constants | Carlos Antonio da Silva | 2012-01-14 | 1 | -4/+7 |
|/ / | |||||
* | | Merge pull request #4398 from castlerock/remove_deprecated | José Valim | 2012-01-14 | 3 | -1/+10 |
|\ \ | | | | | | | deprecated action_controller integration test and performance test | ||||
| * | | Deprecate ActionController::Integration, ActionController::IntegrationTest, ↵ | Vishnu Atrai | 2012-01-15 | 3 | -1/+10 |
|/ / | | | | | | | ActionController::PerformanceTest,ActionController::AbstractRequest, ActionController::Request, ActionController::AbstractResponse, ActionController::Response and ActionController::Routing | ||||
* | | Merge pull request #4463 from nashby/refactor-response_body | José Valim | 2012-01-14 | 1 | -7/+1 |
|\ \ | | | | | | | refactor response_body= method | ||||
| * | | refactor response_body= method | Vasiliy Ermolovich | 2012-01-14 | 1 | -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é Valim | 2012-01-14 | 1 | -3/+5 |
| | | |||||
* | | make sure the migration table is alive and empty | Aaron Patterson | 2012-01-13 | 2 | -2/+12 |
| | | |||||
* | | refactor schema migration table creation to the schema migration model | Aaron Patterson | 2012-01-13 | 4 | -10/+21 |
| | | |||||
* | | Fix race condition :bomb: | Jon Leighton | 2012-01-13 | 1 | -4/+11 |
| | | |||||
* | | stop depending on the filesystem for interleaved migration tests | Aaron Patterson | 2012-01-13 | 8 | -84/+49 |
| | | |||||
* | | convert the migration list to a Set, remove duplicate code | Aaron Patterson | 2012-01-13 | 2 | -16/+18 |
| | | |||||
* | | deprecate the block argument to Migrator#migrate | Aaron Patterson | 2012-01-13 | 1 | -8/+19 |
| | | |||||
* | | refactor the migrate method to filter migrations before running them | Aaron Patterson | 2012-01-13 | 2 | -26/+33 |
| | | |||||
* | | move schema dumper tests to the correct class | Aaron Patterson | 2012-01-13 | 2 | -9/+10 |
| | | |||||
* | | use the schema migration model to dump schema info | Aaron Patterson | 2012-01-13 | 2 | -3/+8 |
| | | |||||
* | | move another migrator test, use schema migration model | Aaron Patterson | 2012-01-13 | 2 | -10/+9 |
| | | |||||
* | | use the model to delete records | Aaron Patterson | 2012-01-13 | 1 | -4/+1 |
| | |