Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Tpyo: fixing several cases of the the | Nicholas Rowe | 2011-02-19 | 1 | -1/+1 |
| | |||||
* | 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 | 12 | -1038/+2075 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | 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 |
| | | |||||
| * | 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. | ||||
| * | | updating Gemfile with more contemporary example | geemus | 2011-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | 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 |
| | | | |||||
| * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-01-20 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | fixes rubycentral url and a minor AR change | Vijay Dev | 2011-01-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | 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 |
| | |/ | |/| | |||||
| * | | 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 |
| | | | |||||
| * | | 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 | 16 | -367/+482 |
|\| | | | | | | | | | | | | | | | 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 | ||||
| * | Do not load all application's task in generated engine | Piotr Sarnacki | 2010-12-19 | 1 | -6/+3 |
| | | |||||
| * | Use require 'bundler/setup' instead of directly calling Bundler.setup in ↵ | Piotr Sarnacki | 2010-12-17 | 1 | -10/+3 |
| | | | | | | | | config/boot.rb | ||||
| * | Allow to use BUNDLE_GEMFILE env variable in boot.rb [#6184 state:resolved] | Piotr Sarnacki | 2010-12-17 | 1 | -1/+1 |
| | | |||||
| * | AppGenerator: use options instead of @options | Piotr Sarnacki | 2010-12-16 | 1 | -3/+3 |
| | | |||||
| * | Kill whitespace! | Piotr Sarnacki | 2010-12-16 | 1 | -3/+3 |
| | | |||||
| * | Generate default layout in engine with --mountable option | Piotr Sarnacki | 2010-12-16 | 3 | -2/+7 |
| | | |||||
| * | Fix generation of prototype files, it should work with --javascript ↵ | Piotr Sarnacki | 2010-12-16 | 2 | -2/+2 |
| | | | | | | | | prototype, not --prototype | ||||
| * | Generate javascripts in engine with --mountable option | Piotr Sarnacki | 2010-12-16 | 3 | -5/+41 |
| | | |||||
| * | Fix indentation and newlines in generated engine | Piotr Sarnacki | 2010-12-16 | 2 | -2/+2 |
| | | |||||
| * | Skip creating migration if --skip option is passed to model generator [#6144 ↵ | Piotr Sarnacki | 2010-12-16 | 1 | -1/+1 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Allow to generate namespaced generators [#6140 state:resolved] | Piotr Sarnacki | 2010-12-16 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Refactor db:load:config to automatically pick additional migrations if ↵ | Piotr Sarnacki | 2010-12-09 | 2 | -15/+1 |
| | | | | | | | | ENGINE_PATH is available | ||||
| * | Rake tasks for managing database while development and testing of engines | Piotr Sarnacki | 2010-12-09 | 3 | -5/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | Some of the engines needs database. As engine needs to be run inside Rails application, migrations and other database operations are run from dummy application. To make that process simple I changed db tasks to look for migrations in both engine's and application's db/migrate directory. You can run all of the database tasks from test/dummy or directly from engine with prefix app, like: rake app:db:migrate rake app:db:migrate:redo | ||||
| * | Do not require fixtures in example integration test in engine if active ↵ | Piotr Sarnacki | 2010-12-09 | 1 | -0/+2 |
| | | | | | | | | record is skipeed | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-12-05 | 1 | -1/+1 |
| |\ | |||||
| | * | For templates' gem method, :env is deprecated, use :group instead | Ryan Bigg | 2010-12-01 | 1 | -1/+1 |
| | | | |||||
| * | | Allow http templates again, fix the broken test | Xavier Shay | 2010-11-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | [#5926 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | Application templates should work with HTTPS too | Mikel Lindsaar | 2010-11-27 | 1 | -1/+1 |
| |/ | |||||
| * | Rakefiles are executables, and rake loads rake, not rakefile code | raggi | 2010-11-25 | 3 | -5/+3 |
| | | |||||
| * | Update to Prototype 1.7 | Santiago Pastorino | 2010-11-23 | 1 | -326/+407 |
| | | | | | | | | [#6042 state:committed] | ||||
* | | Enable IdentityMap when generating new apps. | Emilio Tagua | 2010-11-19 | 1 | -0/+5 |
|/ | |||||
* | Do not run migrations from mounted engine separately. | Piotr Sarnacki | 2010-11-16 | 1 | -2/+0 |
| | | | | | | | | | There is no good way now to run migrations for mounted engine in test application, but that way of running migrations makes it really hard to run engine in development mode and test it (you need to copy migrations in dev mode and in that case in tests they will be run twice). Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fix plugin new --mountable: ActionController instead of ActiveController | Piotr Sarnacki | 2010-11-16 | 1 | -1/+1 |
| | |||||
* | Change inside_namespace method to inside_template and use it in all ↵ | Piotr Sarnacki | 2010-11-16 | 6 | -31/+20 |
| | | | | | | | | | | templates by default The initial implementation of namespacing was based on wrong assumptions. Namespacing path and class names in templates should be based on current namespace and skip_namespace attribute, but it should be not necessary to wrap content on all the templates into additional block methods. | ||||
* | Fix misspelling of 'deprecation' in plugin_generator. | Doug Ireton | 2010-11-16 | 1 | -1/+1 |
| | |||||
* | Bye bye bang bang. | Piotr Sarnacki | 2010-11-16 | 1 | -1/+1 |
| |