Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Railties typos. | R.T. Lechow | 2011-03-04 | 4 | -6/+6 |
| | |||||
* | Always use ActionDispatch::ShowExceptions middleware [#6462 state:resolved] | Prem Sichanugrist | 2011-02-25 | 1 | -1/+1 |
| | | | | This will make sure the application will raise `ActionController::RoutingError` in case "X-Cascade: pass" header was set, usually when there's no route match. | ||||
* | Make sure that we set `env["action_dispatch.show_exceptions"]` | Prem Sichanugrist | 2011-02-25 | 1 | -1/+2 |
| | | | | This has been used by `show_exception` middleware even the setting wasn't get passed to `env` hash. | ||||
* | Tpyo: fixing several cases of the the | Nicholas Rowe | 2011-02-19 | 1 | -1/+1 |
| | |||||
* | improve language and examples in Railtie docs | Jimmy Cuadra | 2011-02-18 | 1 | -33/+21 |
| | |||||
* | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 1 | -2/+2 |
|\ | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb | ||||
| * | Fixed issue #6363, avoid to pluralized already pluralized names and ↵ | Timothy N. Tsvetkov | 2011-02-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | singularize a single in generators, for example stadia is a valid plural for stadium. But calling pluralize for stadia will return stadias which sematically is not corrent in this case [#6363 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-15 | 23 | -1155/+2221 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/examples/performance.rb activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/nested_attributes.rb activerecord/test/cases/relations_test.rb | ||||
| * | added proper require for ruby-debug19 gem to generated Gemfile | Wojciech Wnętrzak | 2011-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | [#6419 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Application's assets should have higher priority than engine's ones | Piotr Sarnacki | 2011-02-09 | 1 | -1/+4 |
| | | | | | | | | [#6388 state:resolved] | ||||
| * | Make rails.js include the CSRF token in the X-CSRF-Token header with every ↵ | Michael Koziarski | 2011-02-08 | 1 | -0/+16 |
| | | | | | | | | ajax request. | ||||
| * | Update jQuery UJS | Santiago Pastorino | 2011-02-05 | 1 | -149/+143 |
| | | |||||
| * | Drop remaining script/plugin sources references | Tim Pope | 2011-02-03 | 1 | -6/+1 |
| | | | | | | | | | | | | [#3742 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-02 | 1 | -1/+1 |
| |\ | |||||
| | * | corrected a mistake in the documentation for assert_migration | misfo | 2011-01-29 | 1 | -1/+1 |
| | | | |||||
| * | | Update to jQuery 1.5 | Santiago Pastorino | 2011-02-01 | 1 | -852/+1849 |
| | | | | | | | | | | | | | | | Check out http://blog.jquery.com/2011/01/31/jquery-15-released/ for more information. | ||||
| * | | Accept 'postgres' as a PostgreSQL driver name in dbconsole for non-AR ORMs ↵ | Akira Matsuda | 2011-02-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | like DataMapper and Sequel [#6180 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | updating Gemfile with more contemporary example | geemus | 2011-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | "rails dbconsole t" must not load "production" but "test" | Akira Matsuda | 2011-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | [#6293 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | Merge branch 'fix-gitignore' of https://github.com/telemachus/rails into ↵ | Mikel Lindsaar | 2011-01-30 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | telemachus-fix-gitignore | ||||
| | * | | Minor fix to gitignore syntax | Peter Aronoff | 2011-01-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Exit with non-zero to signal failure. | Philip Arndt | 2011-01-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use exit(1) instead of exit(false) | Philip Arndt | 2011-01-29 | 1 | -2/+2 |
| | | | | |||||
| * | | | Use Thor's self.exit_on_failure? to exit whenever accessing the generators ↵ | Philip Arndt | 2011-01-29 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | from the CLI and a Thor::Error is raised. | ||||
| * | | | Apply exit code 1 when commands don't succeed so that other libraries can ↵ | Philip Arndt | 2011-01-29 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | properly detect the failure. | ||||
| * | | | load and prefer psych as the YAML parser when it is available | Aaron Patterson | 2011-01-21 | 1 | -0/+6 |
| | |/ | |/| | |||||
| * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-01-20 | 2 | -92/+100 |
| |\ \ | |||||
| | * | | Make all references to engines lowercase in docs. | Matt Buck | 2011-01-19 | 1 | -36/+36 |
| | | | | |||||
| | * | | Copy-edit and format Rails::Engine docs. | Matt Buck | 2011-01-14 | 1 | -85/+93 |
| | | | | |||||
| | * | | fixes rubycentral url and a minor AR change | Vijay Dev | 2011-01-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | Use the derived request_method from AD::Request rather than the raw ↵ | Michael Koziarski | 2011-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | REQUEST_METHOD from rack. This takes _method into account so the log shows the method which ActionController sees. | ||||
| * | | | change sqlite3-ruby => sqlite3 in the generators | Aaron Patterson | 2011-01-16 | 3 | -15/+3 |
| | | | | |||||
| * | | | README.rdoc is a template | Santiago Pastorino | 2011-01-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | plugin new generator should generate config/routes.rb file for full engines | Santiago Pastorino | 2011-01-14 | 2 | -2/+5 |
| | |/ | |/| | |||||
| * | | Allow generators nested in more than one level | Santiago Pastorino | 2011-01-12 | 1 | -1/+1 |
| | | | |||||
| * | | fixes a comment in the generated app Gemfile | Xavier Noria | 2011-01-12 | 1 | -1/+1 |
| | | | |||||
| * | | adds a sample gem call for RedCloth in the generated app Gemfile | Xavier Noria | 2011-01-12 | 1 | -0/+3 |
| | | | |||||
| * | | Initialize these options as false if they are not given | Santiago Pastorino | 2011-01-09 | 1 | -4/+4 |
| | | | |||||
| * | | only define log_level reader once, make sure to initialize @log_level | Aaron Patterson | 2011-01-05 | 1 | -11/+14 |
| | | | |||||
| * | | Make sure that generator's default banner is showing its namespace | Prem Sichanugrist | 2011-01-01 | 1 | -1/+1 |
| |/ | | | | | | | This will make `rails g rspec:install --help` shows "rails generate rspec:install [options]" and not "rails generate install [options]" | ||||
| * | Update JQuery UJS | Santiago Pastorino | 2010-12-26 | 1 | -26/+48 |
| | | |||||
| * | Update Prototype UJS | Santiago Pastorino | 2010-12-26 | 1 | -29/+43 |
| | | |||||
* | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2010-12-20 | 30 | -426/+605 |
|\| | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/persistence.rb | ||||
| * | Small changes on AD::Reloader. | José Valim | 2010-12-20 | 1 | -1/+2 |
| | | |||||
| * | Use AD::Reloader.to_cleanup for reloading [#2873 state:resolved] | John Firebaugh | 2010-12-20 | 1 | -5/+3 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepare | John Firebaugh | 2010-12-20 | 3 | -5/+8 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Introduce ActionDispatch::Reloader | John Firebaugh | 2010-12-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Based on the implementation on the 2-3-stable branch, patches by Hongli Lai <hongli@phusion.nl>, and helpful suggestions from José Valim. Hongli Lai's patches included locking around the request cycle; this is now handled by Rack::Lock (https://github.com/rack/rack/issues/issue/87/). [#2873] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Remove require AS::Concern from places where is already in | Santiago Pastorino | 2010-12-19 | 1 | -2/+0 |
| | | |||||
| * | Fix indentation | Santiago Pastorino | 2010-12-19 | 1 | -3/+3 |
| | | |||||
| * | Use Concern in Rails::Railtie::Configurable | Santiago Pastorino | 2010-12-19 | 1 | -3/+3 |
| | |