Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Added a space to the comment_if helper for formatting purposes | Andrew Davis | 2011-05-25 | 1 | -1/+1 | |
| | | ||||||
* | | Removed unnecessary space in application.rb for formatting | Andrew Davis | 2011-05-25 | 1 | -1/+1 | |
|/ | ||||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 3 | -6/+6 | |
|\ | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | |||||
| * | Removed extra white-spaces on config/environment/test.rb template | Guillermo Iguaran | 2011-05-23 | 1 | -2/+2 | |
| | | ||||||
| * | Removing extra white-spaces on config/environment/development.rb template | Guillermo Iguaran | 2011-05-23 | 1 | -1/+1 | |
| | | ||||||
| * | Minor typo describing engine helpers | Matthew Daubert | 2011-05-22 | 1 | -2/+2 | |
| | | ||||||
| * | Remove duplicate words. | Uģis Ozols | 2011-05-20 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #1305 from amatsuda/require_rdoc_task_fail2 | José Valim | 2011-05-25 | 2 | -0/+4 | |
|\ \ | | | | | | | 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 | 2 | -0/+4 | |
| | | | ||||||
* | | | 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 | 2 | -3/+10 | |
|\ \ | | | | | | | require 'rake/rdoctask' if failed to require 'rdoc/task' | |||||
| * | | require 'rake/rdoctask' if failed to require 'rdoc/task' | Akira Matsuda | 2011-05-26 | 2 | -3/+10 | |
| | | | | | | | | | | | | | | | 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) | |||||
* | | | Add test files to engine's gemspec | Stefan Sprenger | 2011-05-25 | 1 | -0/+3 | |
|/ / | ||||||
* | | Merge pull request #1260 from flippingbits/master | José Valim | 2011-05-25 | 1 | -1/+0 | |
|\ \ | | | | | | | Remove shebang from the template | |||||
| * | | 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 | |
| | | | ||||||
* | | | Removing deprecated config.generators in Rails::Railtie | Guillermo Iguaran | 2011-05-25 | 1 | -5/+0 | |
| | | | ||||||
* | | | Remove deprecated plugin generator | Guillermo Iguaran | 2011-05-24 | 10 | -131/+0 | |
| | | | ||||||
* | | | Removing deprecated config.paths.app.controller API | Guillermo Iguaran | 2011-05-24 | 1 | -26/+0 | |
| | | | ||||||
* | | | Everyone receives app as argument for consistency. | José Valim | 2011-05-25 | 4 | -13/+16 | |
| | | | ||||||
* | | | 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 | 6 | -22/+10 | |
| | | | ||||||
* | | | 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 | 7 | -81/+35 | |
| | | | | | | | | | | | | | | | | | | | | | | | | (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 | 3 | -7/+7 | |
| | | | ||||||
* | | | 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 | 1 | -1/+1 | |
|/ / | ||||||
* | | Add folders app and config to the engine's gemspec if they're available | Stefan Sprenger | 2011-05-24 | 1 | -1/+1 | |
| | | ||||||
* | | 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 | 2 | -2/+2 | |
| | | | | | | | | 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 | 2 | -2/+1 | |
| | | ||||||
* | | Let's load jruby-openssl now for all. #jruby | Arun Agrawal | 2011-05-22 | 1 | -1/+1 | |
| | | ||||||
* | | Bump versions for rc1 | David Heinemeier Hansson | 2011-05-21 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #1174 from bilts/fix-rake-dsl | David Heinemeier Hansson | 2011-05-21 | 2 | -4/+7 | |
|\ \ | | | | | | | Make Rake::DSL methods available within Railtie rake_tasks block (so we're compatible with Rake 0.9.0). | |||||
| * | | Make Rake::DSL methods available within Railtie rake_tasks block | Patrick Quinn | 2011-05-20 | 2 | -4/+7 | |
| | | | | | | | | | | | | Fixes incompatibility introduced by Rake 0.9.0 | |||||
* | | | Uglifier works properly now with 0.5.4 | David Heinemeier Hansson | 2011-05-21 | 1 | -1/+1 | |
|/ / | ||||||
* | | Temporarily ship with ContentLength middleware. | José Valim | 2011-05-20 | 4 | -10/+43 | |
| | | ||||||
* | | Use sprockets prepend_path if its available | Joshua Peek | 2011-05-19 | 1 | -3/+9 | |
| | | ||||||
* | | Use Rack::ContentLength. | José Valim | 2011-05-19 | 1 | -0/+2 | |
| | | ||||||
* | | Merge pull request #1118 from amatsuda/pp_console | Michael Koziarski | 2011-05-19 | 1 | -0/+1 | |
|\ \ | |/ |/| | always enable `pp` on the Rails console | |||||
| * | always enable `pp` on the Rails console | Akira Matsuda | 2011-05-18 | 1 | -0/+1 | |
| | | ||||||
* | | parenthesize the arguments with splat | Akira Matsuda | 2011-05-18 | 2 | -4/+4 | |
| | | | | | | | | to make sure we're not calling the :* operator | |||||
* | | initialize @inside_template | Akira Matsuda | 2011-05-18 | 1 | -0/+1 | |
| | | | | | | | | fixes: "warning: instance variable @inside_template not initialized" | |||||
* | | for ... in => .each | Akira Matsuda | 2011-05-18 | 7 | -10/+10 | |
|/ | | | | I believe this is more modern way |