aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0439-1251/+2425
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/class_methods/join_dependency.rb activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/lib/active_record/associations/has_one_association.rb activerecord/lib/active_record/associations/has_one_through_association.rb activerecord/lib/active_record/associations/through_association_scope.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/associations/has_many_through_associations_test.rb activerecord/test/cases/associations/has_one_through_associations_test.rb activerecord/test/cases/reflection_test.rb activerecord/test/cases/relations_test.rb activerecord/test/fixtures/memberships.yml activerecord/test/models/categorization.rb activerecord/test/models/category.rb activerecord/test/models/member.rb activerecord/test/models/reference.rb activerecord/test/models/tagging.rb
| * revises a few details in public/index.htmlXavier Noria2011-02-281-7/+9
| |
| * Make sure the Thor generator LoadError does not output --dev twice [#6431 ↵Jeff Kreeftmeijer2011-02-271-1/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Always use ActionDispatch::ShowExceptions middleware [#6462 state:resolved]Prem Sichanugrist2011-02-251-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 Sichanugrist2011-02-251-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 theNicholas Rowe2011-02-191-1/+1
| |
| * improve language and examples in Railtie docsJimmy Cuadra2011-02-181-33/+21
| |
| * Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-181-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. Tsvetkov2011-02-161-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_mapEmilio Tagua2011-02-1523-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 GemfileWojciech Wnętrzak2011-02-121-1/+1
| | | | | | | | | | | | | | | | | | [#6419 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| | * Application's assets should have higher priority than engine's onesPiotr Sarnacki2011-02-091-1/+4
| | | | | | | | | | | | [#6388 state:resolved]
| | * Make rails.js include the CSRF token in the X-CSRF-Token header with every ↵Michael Koziarski2011-02-081-0/+16
| | | | | | | | | | | | ajax request.
| | * Update jQuery UJSSantiago Pastorino2011-02-051-149/+143
| | |
| | * Drop remaining script/plugin sources referencesTim Pope2011-02-031-6/+1
| | | | | | | | | | | | | | | | | | [#3742 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| | * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-021-1/+1
| | |\
| | | * corrected a mistake in the documentation for assert_migrationmisfo2011-01-291-1/+1
| | | |
| | * | Update to jQuery 1.5Santiago Pastorino2011-02-011-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 Matsuda2011-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | like DataMapper and Sequel [#6180 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| | * | updating Gemfile with more contemporary examplegeemus2011-01-311-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| | * | "rails dbconsole t" must not load "production" but "test"Akira Matsuda2011-01-311-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 Lindsaar2011-01-301-1/+1
| | |\ \ | | | | | | | | | | | | | | | telemachus-fix-gitignore
| | | * | Minor fix to gitignore syntaxPeter Aronoff2011-01-141-1/+1
| | | | |
| | * | | Exit with non-zero to signal failure.Philip Arndt2011-01-291-1/+1
| | | | |
| | * | | Use exit(1) instead of exit(false)Philip Arndt2011-01-291-2/+2
| | | | |
| | * | | Use Thor's self.exit_on_failure? to exit whenever accessing the generators ↵Philip Arndt2011-01-291-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 Arndt2011-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | properly detect the failure.
| | * | | load and prefer psych as the YAML parser when it is availableAaron Patterson2011-01-211-0/+6
| | | |/ | | |/|
| | * | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-01-202-92/+100
| | |\ \
| | | * | Make all references to engines lowercase in docs.Matt Buck2011-01-191-36/+36
| | | | |
| | | * | Copy-edit and format Rails::Engine docs.Matt Buck2011-01-141-85/+93
| | | | |
| | | * | fixes rubycentral url and a minor AR changeVijay Dev2011-01-061-2/+2
| | | | |
| | * | | Use the derived request_method from AD::Request rather than the raw ↵Michael Koziarski2011-01-181-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 generatorsAaron Patterson2011-01-163-15/+3
| | | | |
| | * | | README.rdoc is a templateSantiago Pastorino2011-01-151-1/+1
| | | | |
| | * | | plugin new generator should generate config/routes.rb file for full enginesSantiago Pastorino2011-01-142-2/+5
| | | |/ | | |/|
| | * | Allow generators nested in more than one levelSantiago Pastorino2011-01-121-1/+1
| | | |
| | * | fixes a comment in the generated app GemfileXavier Noria2011-01-121-1/+1
| | | |
| | * | adds a sample gem call for RedCloth in the generated app GemfileXavier Noria2011-01-121-0/+3
| | | |
| | * | Initialize these options as false if they are not givenSantiago Pastorino2011-01-091-4/+4
| | | |
| | * | only define log_level reader once, make sure to initialize @log_levelAaron Patterson2011-01-051-11/+14
| | | |
| | * | Make sure that generator's default banner is showing its namespacePrem Sichanugrist2011-01-011-1/+1
| | |/ | | | | | | | | | This will make `rails g rspec:install --help` shows "rails generate rspec:install [options]" and not "rails generate install [options]"
| | * Update JQuery UJSSantiago Pastorino2010-12-261-26/+48
| | |
| | * Update Prototype UJSSantiago Pastorino2010-12-261-29/+43
| | |
| * | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2010-12-2030-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é Valim2010-12-201-1/+2
| | |
| | * Use AD::Reloader.to_cleanup for reloading [#2873 state:resolved]John Firebaugh2010-12-201-5/+3
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| | * Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepareJohn Firebaugh2010-12-203-5/+8
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| | * Introduce ActionDispatch::ReloaderJohn Firebaugh2010-12-201-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 inSantiago Pastorino2010-12-191-2/+0
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-26 15:21:47 +0000