Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1305 from amatsuda/require_rdoc_task_fail2 | José Valim | 2011-05-25 | 4 | -11/+6 |
|\ | | | | | 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 | 4 | -11/+6 |
| | | |||||
* | | 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 | 4 | -5/+21 |
|\ | | | | | require 'rake/rdoctask' if failed to require 'rdoc/task' | ||||
| * | require 'rake/rdoctask' if failed to require 'rdoc/task' | Akira Matsuda | 2011-05-26 | 4 | -5/+21 |
| | | | | | | | | | | 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) | ||||
* | | 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 | ||||
* | | | fix Rails::Paths::Root document | Jan Xie | 2011-05-25 | 1 | -4/+3 |
| | | | |||||
* | | | 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 | ||||
* | | | | 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 | 5 | -16/+20 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | 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 | 11 | -105/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | (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 | 2 | -2/+7 |
| | | | | | | | | | | | | their stylesheet or JS engines and still allow the user to turn off compression | ||||
* | | | fixes Rake::RDocTask deprecation warnings from rake 0.9.0 | Vijay Dev | 2011-05-25 | 5 | -10/+10 |
| | | | |||||
* | | | fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 | Vijay Dev | 2011-05-24 | 1 | -2/+2 |
| | | | |||||
* | | | Remove asserts for js ext stuff thats not used any more | David Heinemeier Hansson | 2011-05-24 | 1 | -3/+0 |
| | | | |||||
* | | | The asset pipeline is always on for new apps, dont need the legacy js ext stuff | David Heinemeier Hansson | 2011-05-24 | 1 | -11/+0 |
| | | | |||||
* | | | create the dummy app if there's no test_unit but there's a dummy_path | dmathieu | 2011-05-24 | 2 | -1/+8 |
| |/ |/| | |||||
* | | Fix failing test suite (please run tests before sending pull requests :S) | José Valim | 2011-05-24 | 1 | -1/+2 |
|/ | |||||
* | Add test for gemspec of the generated engine | Stefan Sprenger | 2011-05-24 | 1 | -0/+6 |
| | |||||
* | Add folders app and config to the engine's gemspec if they're available | Stefan Sprenger | 2011-05-24 | 1 | -1/+1 |
| | |||||
* | Parenthesize arguments when the first one is a Regexp literal. | Sebastian Martinez | 2011-05-23 | 3 | -13/+13 |
| | | | | This fixes 'warning: ambiguous first argument; put parentheses or even spaces'. | ||||
* | Removed ActiveSupport::SecureRandom in favour of SecureRandom from the ↵ | Jon Leighton | 2011-05-23 | 2 | -2/+2 |
| | | | | standard library. (It has been deprecated in the 3-1-stable branch.) | ||||
* | Replace references to ActiveSupport::SecureRandom with just SecureRandom, ↵ | Jon Leighton | 2011-05-23 | 3 | -4/+4 |
| | | | | and require 'securerandom' from the stdlib when active support is required. | ||||
* | Removed AS core_ext/kernel/requires as it's not used and is bad practice. | Josh Kalderimis | 2011-05-23 | 2 | -5/+3 |
| | |||||
* | Move content length to the server, this brings the same behavior as in rack 1.2. | José Valim | 2011-05-23 | 3 | -9/+7 |
| | |||||
* | Require rubygems (chill out, just for rails internal tests). | José Valim | 2011-05-23 | 1 | -0/+1 |
| | |||||
* | Merge pull request #1192 from arunagw/removal_extra | José Valim | 2011-05-22 | 1 | -2/+0 |
|\ | | | | | No more need rubygems here. | ||||
| * | No more need rubygems here. | Arun Agrawal | 2011-05-22 | 1 | -2/+0 |
| | | |||||
* | | Merge pull request #1193 from arunagw/railties_tests | José Valim | 2011-05-22 | 1 | -1/+0 |
|\ \ | | | | | | | Loading action_controller twice removed. |