Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Partially revert "A new application now comes with a layout and a stylesheet." | Jeremy Kemper | 2010-04-09 | 8 | -1/+18 |
| | | | | | | | | | This reverts commit ea2c5fa8046e2f953b366adc94f0610ccfea0828. Conflicts: railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb railties/test/generators/app_generator_test.rb | ||||
* | Include app name in layout title | Jeremy Kemper | 2010-04-09 | 2 | -5/+11 |
| | |||||
* | Discourage << as public API, much less config | Jeremy Kemper | 2010-04-09 | 1 | -1/+1 |
| | |||||
* | Layout contents are html-safe | Jeremy Kemper | 2010-04-09 | 1 | -1/+1 |
| | |||||
* | Trim application.html.erb fat | Jeremy Kemper | 2010-04-09 | 1 | -5/+1 |
| | |||||
* | Still use the directory command and also remove the fixture comments. | José Valim | 2010-04-09 | 2 | -13/+3 |
| | |||||
* | Don't include fixtures if --skip-activerecord is given | Santiago Pastorino | 2010-04-09 | 2 | -1/+13 |
| | |||||
* | db:test:prepare for tasks only if AR is loaded | Santiago Pastorino | 2010-04-09 | 1 | -7/+11 |
| | |||||
* | Update rails.js to the latest one at http://github.com/rails/prototype-ujs | José Valim | 2010-04-08 | 1 | -32/+41 |
| | |||||
* | Fix a bug in ActionDispatch::Static where Rails cannot find assets if ↵ | José Valim | 2010-04-08 | 1 | -1/+1 |
| | | | | started in another directory which is not the RAILS_ROOT. | ||||
* | Alleviate the pain in working with utf8 templates by setting a default encoding. | José Valim | 2010-04-07 | 2 | -7/+18 |
| | |||||
* | Use raw in yield since templates engines should not be required to html_safe ↵ | José Valim | 2010-04-06 | 1 | -1/+1 |
| | | | | their contents. | ||||
* | Remove :layout option from generators. | José Valim | 2010-04-06 | 2 | -6/+0 |
| | |||||
* | Update the documentation for Engine and Railtie. | José Valim | 2010-04-05 | 2 | -29/+7 |
| | |||||
* | A new application now comes with a layout and a stylesheet. | José Valim | 2010-04-06 | 12 | -41/+19 |
| | |||||
* | It seems the test directory backtrace line is output with a / before it, ↵ | Ryan Bigg | 2010-04-05 | 1 | -1/+1 |
| | | | | | | thereby previously making it not match the regex. Support APP_DIRS that have backtrace lines maybe beginning with /. [#4277 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | moves Object#singleton_class to Kernel#singleton_class to match Ruby also ↵ | Xavier Noria | 2010-04-05 | 1 | -1/+1 |
| | | | | there, same for #class_eval to simplify, and adds coverage for class_eval | ||||
* | Remove app/views from the load paths [#4226 state:resolved] | José Valim | 2010-04-05 | 2 | -6/+18 |
| | |||||
* | Rename config.cookie_secret to config.secret_token and pass it as ↵ | José Valim | 2010-04-05 | 9 | -16/+33 |
| | | | | configuration in request.env. This is another step forward removing global configuration. | ||||
* | Merge commit 'rails/master' | Xavier Noria | 2010-04-03 | 3 | -2/+6 |
|\ | |||||
| * | Fixing index style [#4313 state:committed] | Santiago Pastorino | 2010-04-02 | 1 | -1/+2 |
| | | | | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | Raise exceptions instead of rendering error templates in test environment ↵ | Rolf Bjaanes | 2010-04-02 | 2 | -1/+4 |
| | | | | | | | | | | | | [#4315 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Merge branch 'master' of git://github.com/rails/rails | Rizwan Reza | 2010-04-02 | 4 | -7/+17 |
|\| | |||||
| * | Prep for beta2, depend on latest Bundler | David Heinemeier Hansson | 2010-04-01 | 1 | -1/+1 |
| | | |||||
| * | Missed __FILE__ | Jeremy Kemper | 2010-03-31 | 1 | -1/+1 |
| | | |||||
| * | To skip bundler, `rm Gemfile`. Create a Gemfile to use it again. | Jeremy Kemper | 2010-03-31 | 3 | -14/+15 |
| | | |||||
| * | Add --skip-bundler option to rails application generator | Joshua Peek | 2010-03-31 | 3 | -1/+10 |
| | | | | | | | | | | NOTE: This does not fix the bundler activation issue. The "bundler" gem will still be installed and activated when you install rails. | ||||
* | | Merge commit 'rails/master' | Xavier Noria | 2010-03-31 | 9 | -48/+67 |
|\| | |||||
| * | Create tmp directories if required before starting server [#3907 state:resolved] | Ravinder Singh | 2010-03-31 | 1 | -0/+5 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Missed a few spots in railties | Joshua Peek | 2010-03-30 | 1 | -1/+1 |
| | | |||||
| * | Bring rdoc tasks back to plugins. | José Valim | 2010-03-30 | 1 | -0/+13 |
| | | |||||
| * | Remove deprecated model_subclass since it was never published. | José Valim | 2010-03-30 | 1 | -12/+0 |
| | | |||||
| * | periods are not metacharacters within character classes | Xavier Noria | 2010-03-30 | 1 | -1/+1 |
| | | |||||
| * | Remove if/else branch when generating the documentation since we are simply ↵ | José Valim | 2010-03-30 | 1 | -52/+37 |
| | | | | | | | | inspecting the load path. | ||||
| * | Changed gem_path to yield the path found in $LOAD_PATH to a block. | postmodern | 2010-03-30 | 1 | -15/+33 |
| | | | | | | | | | | | | | | * This allows gems not found in $LOAD_PATH to be safely ignored by the rails documentation task. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Fix syntax error and avoid the use of unless/else. | Michael Koziarski | 2010-03-30 | 1 | -8/+9 |
| | | |||||
| * | Replace the placeholder base_hook API with on_load. To specify some code that | wycats | 2010-03-29 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | | should run during framework load do: ActiveSupport.on_load(:action_controller) do # Code run in the context of AC::Base end | ||||
| * | Just inspect load paths to generate the documentation. | José Valim | 2010-03-30 | 1 | -6/+1 |
| | | |||||
| * | Revert "Ruby 1.9: use ruby-debug19. [#3949 state:resolved]" | wycats | 2010-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | This wasn't the issue here; we need to beef up the docs and speak to Wayne and Mark about installation. This reverts commit da238dafd7c242eb75ae37e6243b61baf763e3d0. | ||||
| * | Ruby 1.9: use ruby-debug19. [#3949 state:resolved] | Jeremy Kemper | 2010-03-30 | 1 | -1/+1 |
| | | |||||
| * | Work without bundler | Jeremy Kemper | 2010-03-29 | 1 | -31/+46 |
| | | |||||
| * | Revert "Ruby 1.9: use ruby-debug19. [#3949 state:resolved]" | wycats | 2010-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | This wasn't the issue here; we need to beef up the docs and speak to Wayne and Mark about installation. This reverts commit da238dafd7c242eb75ae37e6243b61baf763e3d0. | ||||
| * | Ruby 1.9: use ruby-debug19. [#3949 state:resolved] | Jeremy Kemper | 2010-03-29 | 1 | -1/+1 |
| | | |||||
| * | Revert "Update USAGE docs for generators." | José Valim | 2010-03-29 | 6 | -6/+6 |
| | | | | | | | | This reverts commit d31e03f3566471f2ad04dc6dace889fae962f7a8. | ||||
| * | Revert "Reorganized app/test directory. [#3057 state:resolved]" | José Valim | 2010-03-29 | 13 | -74/+23 |
| | | | | | | | | This reverts commit a0dc6755db71b33aebccdb95fd0dd7097c934c04. | ||||
| * | Update USAGE docs for generators. | Rizwan Reza | 2010-03-28 | 6 | -6/+6 |
| | | |||||
| * | Reorganized app/test directory. [#3057 state:resolved] | Rizwan Reza | 2010-03-28 | 13 | -23/+74 |
| | | | | | | | | | | | | | | | | | | | | Run 'rake update:test_directory' to reorganize your already generated apps. test/functional -> test/controllers test/functional -> test/controllers test/unit/helpers -> test/helpers test/unit/**/*_observer_test.rb -> test/observers test/unit -> test/models | ||||
| * | Reapply Rizwan's patch, but memoize Bundler.load.specs in an ivar. [#3697 ↵ | Rizwan Reza | 2010-03-28 | 1 | -41/+34 |
| | | | | | | | | | | state:resolved] Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | Merge remote branch 'rizwan/restrict' | wycats | 2010-03-28 | 1 | -0/+1 |
| |\ | |||||
| | * | adds missing requires for Object#blank? and Object#present? | Xavier Noria | 2010-03-28 | 1 | -0/+1 |
| | | |