Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2008-07-28 | 19 | -228/+1233 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/cookies.rb actionpack/lib/action_controller/streaming.rb actionpack/lib/action_controller/test_case.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/helpers/date_helper.rb actionpack/lib/action_view/helpers/debug_helper.rb actionpack/lib/action_view/helpers/form_options_helper.rb actionpack/lib/action_view/helpers/javascript_helper.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/validations.rb activeresource/README activesupport/lib/active_support/core_ext/hash/reverse_merge.rb activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone_info.rb activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone.rb railties/doc/guides/actionview/helpers.markdown railties/doc/guides/actionview/partials.markdown railties/doc/guides/activerecord/basics.markdown | ||||
| * | Check for ActionMailer and ActionController before attempting to eager load ↵ | Sam Granieri | 2008-07-24 | 2 | -3/+22 |
| | | | | | | | | | | | | their view paths Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Added config.dependency_loading to enable or disable the dependency loader ↵ | Joshua Peek | 2008-07-24 | 1 | -3/+24 |
| | | | | | | | | after initialization | ||||
| * | Load view path cache after plugins and gems. | Joshua Peek | 2008-07-23 | 1 | -3/+10 |
| | | |||||
| * | Make script/plugin work with svn+ssh urls. [#662 state:resolved] | Miles Georgi | 2008-07-22 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Added configurable eager load paths. Defaults to app/models, ↵ | Joshua Peek | 2008-07-21 | 2 | -4/+23 |
| | | | | | | | | app/controllers, and app/helpers | ||||
| * | Preload application classes. Uses same strategy as phusion passenger. | Joshua Peek | 2008-07-21 | 1 | -0/+11 |
| | | |||||
| * | Update Prototype to 1.6.0.2 (Patrick Joyce) [#599 status:committed] | David Heinemeier Hansson | 2008-07-19 | 1 | -154/+150 |
| | | |||||
| * | Prefer Mongrel over Thin [#658 state:resolved] | Joshua Peek | 2008-07-19 | 1 | -3/+3 |
| | | |||||
| * | Stub out timestamped_migrations in generator tests | Joshua Peek | 2008-07-19 | 1 | -1/+2 |
| | | |||||
| * | Introduce simple internationalization support | Jeremy Kemper | 2008-07-17 | 1 | -0/+2 |
| | | |||||
| * | Set config.active_record.timestamped_migrations = false to have migrations ↵ | Nik Wakelin | 2008-07-17 | 1 | -1/+16 |
| | | | | | | | | | | | | with numeric prefix instead of UTC timestamp. [#446 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Merge with docrails. | Pratik Naik | 2008-07-16 | 11 | -19/+1120 |
| | | |||||
| * | Add some useful comments to rackup config | Joshua Peek | 2008-07-15 | 1 | -0/+14 |
| | | |||||
| * | Add config.ru to rails app generator | Pratik Naik | 2008-07-16 | 2 | -0/+4 |
| | | |||||
| * | ActionMailer and ActionView can share the same view path cache | Joshua Peek | 2008-07-15 | 1 | -2/+4 |
| | | |||||
| * | Removed config.action_view.cache_template_loading, use config.cache_classes ↵ | Joshua Peek | 2008-07-15 | 3 | -2/+1 |
| | | | | | | | | instead | ||||
| * | requiring rubygems version 1.1.1 | David Lowenfels | 2008-07-15 | 1 | -4/+4 |
| | | |||||
| * | Give more info on missing gems and abort instead of printing a warning. App ↵ | Jeremy Kemper | 2008-07-15 | 1 | -5/+10 |
| | | | | | | | | can begin in incomplete state otherwise. | ||||
| * | Move performance test helper settings to railties | Pratik Naik | 2008-07-15 | 2 | -6/+7 |
| | | |||||
| * | Cache template loading for performance tests | Jeremy Kemper | 2008-07-14 | 1 | -0/+1 |
| | | |||||
| * | Added db:charset support to PostgreSQL. [#556 state:resolved] | Sebastian A. Espindola | 2008-07-14 | 1 | -0/+3 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Make script/plugin install <plugin> -r <revision> option work with git based ↵ | Tim Pope | 2008-07-14 | 2 | -15/+37 |
| | | | | | | | | | | | | plugins. [#257 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Enable loading fixtures from arbitrary locations. [#586 state:resolved] | Jacek Becela | 2008-07-14 | 1 | -4/+7 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Use full path in database tasks so commands will work outside of Rails root ↵ | Tapajós | 2008-07-13 | 1 | -10/+10 |
| | | | | | | | | | | | | [#612 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Improve the plugin creation guide's title. | Hongli Lai (Phusion) | 2008-07-21 | 1 | -2/+2 |
| | | |||||
* | | Update guide generation task for latest Mizuho commandline options. Add ↵ | Hongli Lai (Phusion) | 2008-07-20 | 27 | -1/+7 |
| | | | | | | | | admonition icons for the guides. | ||||
* | | Fix some layout/styiling problems. | Hongli Lai (Phusion) | 2008-07-20 | 1 | -4/+6 |
| | | |||||
* | | Convert 'creating plugins' guide to asciidoc format. | Hongli Lai (Phusion) | 2008-07-20 | 12 | -864/+1007 |
| | | |||||
* | | Revived two ancient manuals from manuals.rubyonrails.org: 'Securing Rails ↵ | Hongli Lai (Phusion) | 2008-07-20 | 6 | -0/+1634 |
| | | | | | | | | Applications' and 'Testing Rails Applications'. Now in Asciidoc format generated by Mizuho. | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2008-07-12 | 8 | -21/+35 |
|\| | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb railties/lib/rails_generator/commands.rb | ||||
| * | Refactor template preloading. New abstractions include Renderable mixins and ↵ | Joshua Peek | 2008-07-12 | 1 | -1/+1 |
| | | | | | | | | a refactored Template class. | ||||
| * | Ensure script/generate finds generators from symlinked plugins. [#449 ↵ | Daniel Guettler | 2008-07-12 | 1 | -1/+1 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Use require_dependency 'application' not require in the console bootstraps ↵ | Michael Koziarski | 2008-07-11 | 1 | -1/+1 |
| | | | | | | | | to avoid requiring application.rb twice | ||||
| * | Added tests to show that 2d372d7 breaks old generator behavior (#545 ↵ | Joshua Peek | 2008-07-11 | 1 | -0/+19 |
| | | | | | | | | state:resolved) | ||||
| * | Revert "Fixed generator collisions for nested controller modules." | Joshua Peek | 2008-07-11 | 1 | -16/+9 |
| | | | | | | | | This reverts commit 2d372d704987e05712ccd937e78d8dbd41242efe. | ||||
| * | Added notes to Routing documentation and routes.rb regarding defaults routes ↵ | Clemens Kofler | 2008-07-10 | 1 | -0/+2 |
| | | | | | | | | | | | | opening the whole application for GET requests Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Plugin locator: sort directory listing because we can't assume that the OS ↵ | Hongli Lai (Phusion | 2008-07-09 | 1 | -1/+1 |
| | | | | | | | | will do it for us. This fixes some unit test failures. | ||||
| * | Use ActiveSupport::TimeZone in time:zones rake tasks | Pratik Naik | 2008-07-04 | 1 | -1/+1 |
| | | |||||
* | | Fix documentation typo (classic copy & paste error). | Diego Algorta | 2008-07-07 | 1 | -1/+1 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2008-07-04 | 11 | -44/+146 |
|\| | |||||
| * | Support for custom annotations with rake notes:custom and DRY up the task ↵ | Michael Koziarski | 2008-07-03 | 1 | -11/+8 |
| | | | | | | | | | | | | definition. e.g. rake notes:custom ANNOTATION=WTF | ||||
| * | Added Rails.initialized? flag | Joshua Peek | 2008-07-02 | 2 | -23/+34 |
| | | |||||
| * | Ensure script/plugin unsource 'Usage' text is correct. [#526 state:resolved] | Ricardo Santos | 2008-07-02 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Make rake test:uncommitted work with Git. | Tim Pope | 2008-07-02 | 2 | -4/+12 |
| | | | | | | | | | | | | Note : rake test:uncommitted is considering only unstaged files. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure Rails::Generator quotes file names while generating diff. [#264 ↵ | Carl Porth | 2008-07-02 | 1 | -1/+1 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure observer test inherits from ActiveSupport::TestCase | Pratik Naik | 2008-06-27 | 1 | -1/+1 |
| | | |||||
| * | Warn and uses singularized ModelName if a plural ModelName is given to ↵ | Pat George | 2008-06-27 | 2 | -1/+50 |
| | | | | | | | | | | | | script/generate. Override with --force-plural. [#333 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Added Thin support to script/server. [#488 state:resolved] | Bob Klosinski | 2008-06-25 | 3 | -2/+39 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2008-06-25 | 40 | -188/+311 |
|\| | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/javascript_helper.rb activesupport/lib/active_support/dependencies.rb activesupport/lib/active_support/inflector.rb activesupport/lib/active_support/values/time_zone.rb |