Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1285 from joshk/remove_active_record_deprecations | Aaron Patterson | 2011-05-25 | 12 | -162/+4 |
|\ | | | | | removed deprecated methods, and related tests, from ActiveRecord | ||||
| * | removed deprecated methods, and related tests, from ActiveRecord | Josh Kalderimis | 2011-05-25 | 12 | -162/+4 |
| | | |||||
* | | Merge pull request #1305 from amatsuda/require_rdoc_task_fail2 | José Valim | 2011-05-25 | 5 | -17/+7 |
|\ \ | | | | | | | Ensure RDoc::Task exists even if 'rdoc/task' was not required | ||||
| * | | Ensure RDoc::Task exists even if 'rdoc/task' was not required | Akira Matsuda | 2011-05-26 | 5 | -17/+7 |
| | | | |||||
* | | | Merge pull request #1308 from vijaydev/fix-codestat-indent | José Valim | 2011-05-25 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Minor indentation fix in code_statistics | ||||
| * | | | fix indentation | Vijay Dev | 2011-05-25 | 1 | -1/+1 |
| |/ / | |||||
* / / | Renaming helper in the Rake task, but why is this needed in the first place? ↵ | wycats | 2011-05-25 | 1 | -1/+1 |
|/ / | | | | | | | (paging JP) | ||||
* | | Merge pull request #1301 from amatsuda/require_rdoc_task_fail | Xavier Noria | 2011-05-25 | 5 | -6/+27 |
|\ \ | | | | | | | require 'rake/rdoctask' if failed to require 'rdoc/task' | ||||
| * | | require 'rake/rdoctask' if failed to require 'rdoc/task' | Akira Matsuda | 2011-05-26 | 5 | -6/+27 |
| | | | | | | | | | | | | | | | fixes a regression introduced by b921679d0dd3d5ca16f0362c2b34e7703cfe15e5 require 'rdoc/task' fails if the system RDoc version is below 2.4.2 (e.g. CRuby 1.8.7) | ||||
* | | | Merge pull request #1299 from cesario/mit-license | José Valim | 2011-05-25 | 3 | -3/+3 |
|\ \ \ | | | | | | | | | Ensure MIT-LICENSE is included in all the gemspec's | ||||
| * | | | Add the MIT-LICENSE to the Active Support gemspec | Franck Verrot | 2011-05-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add the MIT-LICENSE to the Active Resource gemspec | Franck Verrot | 2011-05-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add the MIT-LICENSE to the Active Record gemspec | Franck Verrot | 2011-05-25 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1298 from flippingbits/add_test_files_to_gemspec | José Valim | 2011-05-25 | 2 | -1/+13 |
|\ \ \ | |/ / |/| | | Add test files to engine's gemspec | ||||
| * | | Improve test assertion | Stefan Sprenger | 2011-05-25 | 1 | -1/+3 |
| | | | |||||
| * | | Remove whitespaces from empty line | Stefan Sprenger | 2011-05-25 | 1 | -1/+1 |
| | | | |||||
| * | | Add test files to engine's gemspec | Stefan Sprenger | 2011-05-25 | 2 | -0/+10 |
|/ / | |||||
* | | Merge pull request #1260 from flippingbits/master | José Valim | 2011-05-25 | 2 | -1/+5 |
|\ \ | | | | | | | Remove shebang from the template | ||||
| * | | Add test for shebang in engine's script/rails file | Stefan Sprenger | 2011-05-24 | 1 | -0/+5 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/rails/rails | Stefan Sprenger | 2011-05-24 | 1 | -1/+2 |
| |\ \ | |||||
| * | | | Remove shebang from the template since it's already added by the | Stefan Sprenger | 2011-05-24 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | generator | ||||
* | | | | Merge pull request #1297 from cesario/1294-allocated-object-cant-be-inspected | José Valim | 2011-05-25 | 2 | -6/+18 |
|\ \ \ \ | | | | | | | | | | | #1294 : allocated object cant be inspected [closes #1294] | ||||
| * | | | | Fix the AR::Base#inspect method [closes #1294] | Franck Verrot | 2011-05-25 | 1 | -6/+10 |
| | | | | | |||||
| * | | | | Test AR::Base#inspect on an allocated object not yet initialized | Franck Verrot | 2011-05-25 | 1 | -0/+8 |
|/ / / / | |||||
* | | | | Merge pull request #1293 from janx/master | José Valim | 2011-05-25 | 1 | -4/+3 |
|\ \ \ \ | | | | | | | | | | | Fix Rails::Paths::Root documentation | ||||
| * | | | | fix Rails::Paths::Root document | Jan Xie | 2011-05-25 | 1 | -4/+3 |
| | | | | | |||||
* | | | | | Merge pull request #1292 from arunagw/database_generators | José Valim | 2011-05-25 | 1 | -2/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Database.rake file fixed for load_generators | ||||
| * | | | | Database.rake file fixed for load_generators | Arun Agrawal | 2011-05-25 | 1 | -2/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1290 from arunagw/load_generators_use | José Valim | 2011-05-25 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Using load_generators | ||||
| * | | | | Using load_generators | Arun Agrawal | 2011-05-25 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Use load_generators instead. | José Valim | 2011-05-25 | 1 | -4/+2 |
| | | | | |||||
* | | | | Merge pull request #1288 from guilleiguaran/railties-deprecations | José Valim | 2011-05-25 | 15 | -287/+1 |
|\ \ \ \ | | | | | | | | | | | Remove Railties deprecated methods | ||||
| * | | | | Removing deprecated config.generators in Rails::Railtie | Guillermo Iguaran | 2011-05-25 | 1 | -5/+0 |
| | | | | | |||||
| * | | | | Remove deprecated plugin generator | Guillermo Iguaran | 2011-05-24 | 11 | -202/+0 |
| | | | | | |||||
| * | | | | Removing Deprecated Path API tests | Guillermo Iguaran | 2011-05-24 | 1 | -53/+0 |
| | | | | | |||||
| * | | | | Removing deprecated config.paths.app.controller API | Guillermo Iguaran | 2011-05-24 | 2 | -27/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1287 from ↵ | José Valim | 2011-05-25 | 1 | -7/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | guilleiguaran/removing-test_load_generators_from_railties load_generators_from_railties was removed, remove test with error about it | ||||
| * | | | | load_generators_from_railties was removed, remove failing ↵ | Guillermo Iguaran | 2011-05-24 | 1 | -7/+0 |
| | |_|/ | |/| | | | | | | | | | | test_load_generators_from_railties | ||||
* | | | | Merge pull request #1286 from arunagw/fixed_failing_generators_test | Aaron Patterson | 2011-05-24 | 2 | -2/+3 |
|\ \ \ \ | |/ / / |/| | | | Fixed failing tests for generators_test | ||||
| * | | | fixed test_deliver_is_notified need base_mailer | Arun Agrawal | 2011-05-25 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fixed failing tests for generators_test | Arun Agrawal | 2011-05-25 | 1 | -2/+2 |
|/ / / | |||||
* | | | Everyone receives app as argument for consistency. | José Valim | 2011-05-25 | 6 | -18/+22 |
| | | | |||||
* | | | Actually this file may be invoked directly as well with --dev. | José Valim | 2011-05-25 | 2 | -1/+3 |
| | | | |||||
* | | | Streamline generators initialization flow. | José Valim | 2011-05-25 | 7 | -23/+11 |
| | | | |||||
* | | | Update default Gemfile to point to sass-rails, not sass | wycats | 2011-05-24 | 1 | -1/+1 |
| | | | |||||
* | | | Fix infinite recursion where a lazy default scope references a scope. Fixes ↵ | Jon Leighton | 2011-05-25 | 4 | -4/+36 |
| | | | | | | | | | | | | #1264. | ||||
* | | | Hide css:* and the default stylesheet from rails g | wycats | 2011-05-24 | 1 | -1/+6 |
| | | | |||||
* | | | Update generator config to support hiding namespaces and pass the app into ↵ | wycats | 2011-05-24 | 4 | -4/+12 |
| | | | | | | | | | | | | generator blocks | ||||
* | | | Move SCSS generators and default templates from Rails to the Sass Railtie ↵ | tomhuda | 2011-05-24 | 12 | -124/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | (d435726312601edb3ba6f97b34f562221f72c1f8). * Sass gem registers a compressor * Sass gem registers generators for assets and scaffold * Create a default stylesheet_engine ("css") for apps that remove the Sass gem | ||||
* | | | Change compressor API so that plugins can register default compressors for ↵ | tomhuda | 2011-05-24 | 3 | -5/+11 |
| | | | | | | | | | | | | their stylesheet or JS engines and still allow the user to turn off compression |