Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| * | | Rails 3 application can run performance tests now. [#4171 state:resolved] | Rizwan Reza | 2010-03-28 | 1 | -1/+1 |
| |/ | |||||
* / | Changes migration number to version due to ambiguity. [#3065 state:committed] | Rizwan Reza | 2010-03-28 | 1 | -3/+3 |
|/ | |||||
* | Fixes typo in environments/production.rb template. | watsonian | 2010-03-27 | 1 | -1/+1 |
| | |||||
* | Do not check for a valid const name in Rails 3.0 applications. [#4200 ↵ | José Valim | 2010-03-27 | 1 | -1/+2 |
| | | | | state:resolved] | ||||
* | Make X-Sendfile default to "" so it works correctly in dev mode. | wycats | 2010-03-26 | 1 | -0/+9 |
| | | | | | Provide a default in production.rb that can be modified, so that people who care about sendfile performance in production mode can get better performance easily. | ||||
* | Merge branch 'master' into docrails | wycats | 2010-03-26 | 156 | -121/+11102 |
|\ | |||||
| * | Just assert for 'Hi' in generated mailer tests. | José Valim | 2010-03-26 | 1 | -1/+1 |
| | | |||||
| * | Move application configuration to the application configuration object, ↵ | José Valim | 2010-03-26 | 6 | -94/+70 |
| | | | | | | | | remove railtie_name and engine_name and allow to set the configuration object. | ||||
| * | Revert "find railties and engines by name [4264 state:resolved]" | José Valim | 2010-03-26 | 1 | -4/+0 |
| | | | | | | | | This reverts commit 7b8399b80cfff58cfe2313187ca3c803de8c8955. | ||||
| * | Make script/dbconsole work with oracle (sqlplus ↵ | Edgars Beigarts | 2010-03-26 | 1 | -0/+12 |
| | | | | | | | | | | | | <username>[/<password>][@<connect_identifier>]) [#3773 state:resolved] | ||||
| * | Improve heuristic for railties default name, otherwise railties may be named ↵ | José Valim | 2010-03-26 | 2 | -8/+11 |
| | | | | | | | | :railtie, :engine and so on. | ||||
| * | find railties and engines by name [4264 state:resolved] | Josh Susser | 2010-03-26 | 1 | -0/+4 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | init.rb in plugins is here to stay | wycats | 2010-03-23 | 3 | -31/+22 |
| | | |||||
| * | Ensure lib/rails/initializers/*.rb also works for gems. | José Valim | 2010-03-23 | 3 | -30/+32 |
| | | |||||
| * | Load plugin initializers from lib/rails/initializers/*.rb | Joshua Peek | 2010-03-23 | 1 | -6/+13 |
| | | |||||
| * | Explicitly require files before monkey patching them. | José Valim | 2010-03-23 | 1 | -1/+5 |
| | | |||||
| * | rake tasks should use the new app generator path [#4257 state:resolved] | Sebastian Martinez | 2010-03-23 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | bin/rails should use the new app generator path. | José Valim | 2010-03-23 | 1 | -1/+1 |
| | | |||||
| * | Load generators from both lib/rails/generators and lib/generators. Using the ↵ | José Valim | 2010-03-23 | 138 | -3/+10814 |
| | | | | | | | | former since it's less obstrusive. |