| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Fix failing test related to persist glob when replacing a path | Carlos Antonio da Silva | 2012-07-01 | 1 | -1/+1 | |
| | | | | | | | | | Introduced in pull request #6910, merged in 2ee3fa1a48513a2c42833e2e1f60fe03769bc295 | |||||
| * | | Merge pull request #6910 from mulder/fix_path_glob | José Valim | 2012-07-01 | 2 | -1/+9 | |
| |\ \ | |/ |/| | Persist glob when replacing a path | |||||
| | * | Persist glob when replacing a path | Nicholas Mulder | 2012-06-30 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Rails::Paths::Root's []= is used to replace a path it should persist the previous path's glob. Without passing the glob along we get gnarly bugs when trying to wire up things like engines. module FooEngine class Engine < ::Rails::Engine isolate_namespace FooEngine config.paths['config/initializers'] = "lib/foo_engine/initializers" end end ## Example of behaviour before this commit. # # Before the initializer override: >> FooEngine::Engine.config.paths["config/initializers"].glob => "**/*.rb" # After the initializer override: >> FooEngine::Engine.config.paths["config/initializers"].glob => nil ## Example of behaviour after this commit. # # Before the initializer override: >> FooEngine::Engine.config.paths["config/initializers"].glob => "**/*.rb" # After the initializer override: >> FooEngine::Engine.config.paths["config/initializers"].glob => "**/*.rb" | |||||
| * | | Remove another missing test related to draw external routes | Carlos Antonio da Silva | 2012-06-29 | 1 | -10/+0 | |
| | | | | | | | | | Related with 5e7d6bb | |||||
| * | | Revert "Allow loading external route files from the router" | José Valim | 2012-06-29 | 7 | -112/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6acebb38bc0637bc05c19d87f8767f16ce79189b. Usage of this feature did not reveal any improvement in existing apps. Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb guides/source/routing.textile railties/lib/rails/engine.rb railties/lib/rails/paths.rb railties/test/paths_test.rb | |||||
| * | | Remove unused responsibilities and add a few load definitions to engines | José Valim | 2012-06-29 | 4 | -147/+140 | |
| |/ | | | | | | | | Since plugins were removed, we can clean up a few methods in engines. We also use this opportunity to move `load_console`, `load_tasks` and `load_runner` to Rails::Engine. This means that, if someone wants to improve script/rails for engines to support console or runner commands, part of the work is already done. | |||||
| * | Remove unnecessary Railties structure now that plugins are gone | José Valim | 2012-06-29 | 5 | -121/+85 | |
| | | ||||||
| * | Depend on thor 0.15.4 | José Valim | 2012-06-29 | 1 | -1/+1 | |
| | | ||||||
| * | Rename RouteInspect to RoutesInspector for consistency | José Valim | 2012-06-29 | 4 | -7/+7 | |
| | | ||||||
| * | Add changelog entry for polymorphic option in model generator | Carlos Antonio da Silva | 2012-06-27 | 1 | -0/+10 | |
| | | | | | | Pull request #6856, merged in 52f6e47682003c83b0466bf5e140ee302498a226. [ci skip] | |||||
| * | Merge pull request #6880 from kennyj/fix_20120628 | Carlos Antonio da Silva | 2012-06-27 | 1 | -1/+1 | |
| |\ | | | | | Fix wrong testcase for db:test:prepare, and wrong environment in AR rake task. | |||||
| | * | Fix wrong testcase. This is a testcase for db:test:prepare. | kennyj | 2012-06-28 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #6856 from lexmag/polymorphic_generators | Carlos Antonio da Silva | 2012-06-27 | 3 | -13/+41 | |
| |\ \ | |/ |/| | | | | | | | | | | | | | Add polymorphic option to model generator For instance, $ rails g model Product supplier:references{polymorphic} generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration. | |||||
| | * | Add polymorphic option to model generator | Aleksey Magusev | 2012-06-27 | 3 | -13/+41 | |
| | | | | | | | | | | | | | | | | | | | | | For instance, $ rails g model Product supplier:references{polymorphic} generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration. Also fix model_generator_test.rb#L196 and #L201 | |||||
| * | | Merge pull request #6839 from bcardarella/async-actionmailer | Aaron Patterson | 2012-06-26 | 2 | -0/+6 | |
| |\ \ | | | | | | | Async actionmailer | |||||
| | * | | Updated Changelogs | Brian Cardarella | 2012-06-23 | 1 | -0/+3 | |
| | | | | ||||||
| | * | | Add commented out ActionMailer async config option | Brian Cardarella | 2012-06-23 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | Change the behavior of db:test:prepare task when schema_format is sql for ↵ | kennyj | 2012-06-26 | 1 | -0/+9 | |
| | | | | | | | | | | | | | consistency. | |||||
| * | | | Change the behavior of db:test:clone task when schema_format is sql for ↵ | kennyj | 2012-06-26 | 1 | -0/+9 | |
| | |/ |/| | | | | | consistency. | |||||
| * | | ruby 1.9 hash syntax for generated code | Richard Huang | 2012-06-23 | 6 | -16/+16 | |
| |/ | | | | | | | | app/controllers/application_controller.rb app/views/layouts/application.html.erb config/application.rb config/routes.rb test/performance/browsing_test.rb | |||||
| * | add :nodoc: to internal implementations [ci skip] | Francesco Rodriguez | 2012-06-22 | 1 | -1/+1 | |
| | | ||||||
| * | Run the logger tests in isolation | Rafael Mendonça França | 2012-06-19 | 1 | -0/+2 | |
| | | ||||||
| * | run the notes tests in isolation | Aaron Patterson | 2012-06-19 | 1 | -0/+4 | |
| | | ||||||
| * | run railties tests in parallel, default to 2 cores | Aaron Patterson | 2012-06-19 | 1 | -2/+0 | |
| | | ||||||
| * | join any extra args to the tmp path | Aaron Patterson | 2012-06-19 | 1 | -0/+1 | |
| | | ||||||
| * | expand the tmpdir to the realpath so tests on OS X pass | Aaron Patterson | 2012-06-19 | 2 | -2/+2 | |
| | | ||||||
| * | use system tmpdir rather than our own | Aaron Patterson | 2012-06-19 | 3 | -13/+26 | |
| | | ||||||
| * | Change minimum (default) log level in PostgreSQL to warning. | kennyj | 2012-06-18 | 2 | -4/+4 | |
| | | ||||||
| * | Require thor 0.15.3 onwards | José Valim | 2012-06-18 | 2 | -5/+2 | |
| | | ||||||
| * | Don't read csv file during executing db:fixtures:load. | kennyj | 2012-06-17 | 1 | -0/+12 | |
| | | ||||||
| * | TestCase does not need to be loaded when loading the framework | Aaron Patterson | 2012-06-15 | 1 | -1/+10 | |
| | | ||||||
| * | Fix observers with AR::Model | Jon Leighton | 2012-06-15 | 1 | -0/+21 | |
| | | ||||||
| * | Fix config.active_record.whitelist_attributes with AR::Model | Jon Leighton | 2012-06-15 | 1 | -3/+4 | |
| | | ||||||
| * | Merge pull request #6708 from ↵ | José Valim | 2012-06-11 | 1 | -1/+1 | |
| |\ | | | | | | | | | amatsuda/ignore_git_ignored_files_in_rake_test_uncommitted ignore .gitignore'd files in rake test:uncomitted | |||||
| | * | ignore .gitignore'd files in rake test:uncomitted | Akira Matsuda | 2012-06-12 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #6690 from suginoy/fix-templates-copy | Rafael Mendonça França | 2012-06-11 | 2 | -1/+12 | |
| |\ \ | |/ |/| | Fix: 'rake rails:templates:copy' doesn't work | |||||
| | * | Added a testcase for #6690. | kennyj | 2012-06-12 | 1 | -0/+11 | |
| | | | ||||||
| | * | fix stylesheet template dir | Sugino Yasuhiro | 2012-06-09 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #6692 from schneems/schneems/something-went-wrong | José Valim | 2012-06-10 | 2 | -0/+2 | |
| |\ \ | | | | | | | Add Prompt to 404 & 500 Pages to Check Logs in Production | |||||
| | * | | add prompt to 404 & 500 pages to check logs | schneems | 2012-06-09 | 2 | -0/+2 | |
| | |/ | | | | | When new programmers push their code to a production server and receive an error they often don't know to check the logs, this simple reminder will help. Most professional applications have custom error pages so this change shouldn't affect them. The wording of the message should not confuse non-developer visitors. | |||||
| * | | Use . instead of :: for class methods, add CHANGELOG entries | José Valim | 2012-06-10 | 2 | -1/+3 | |
| | | | ||||||
| * | | Merge pull request #6665 from schneems/schneems/raise-migration-error | José Valim | 2012-06-10 | 3 | -0/+20 | |
| |\ \ | |/ |/| | Notify A User they Have Pending Migrations | |||||
| | * | test errors for pending migrations | schneems | 2012-06-09 | 1 | -0/+15 | |
| | | | | | | | App should raise error on page_load | |||||
| | * | raise error for pending migration | schneems | 2012-06-09 | 2 | -0/+5 | |
| | | | | | | | can be configured by setting config.active_record.migration. Setting to :page_load will raise an error on each page refresh if there are migrations that are pending. Setting to :page_load is defaulted in development for new applications. | |||||
| * | | Fix tests, active_authorizer shouldn't include blank values | Piotr Sarnacki | 2012-06-09 | 1 | -1/+1 | |
| | | | | | | | | | Fix for a test failing after: 00ff0a6776 | |||||
| * | | Merge pull request #6681 from arunagw/plugin_gen_fix | Rafael Mendonça França | 2012-06-08 | 2 | -3/+9 | |
| |\ \ | | | | | | | Plugin gen fix | |||||
| | * | | We should not include engine.rake file into rake | Arun Agrawal | 2012-06-08 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if we are passing -T which is skip_test_unit See issue #6673 for more details. I saw that we are not creating dummy app even if we do skip_test_unit. Fixes #6673 | |||||
| | * | | Removed protected as we already doing it above. | Arun Agrawal | 2012-06-08 | 1 | -2/+0 | |
| | | | | ||||||
| * | | | Don't add sqlite3 to gemspec with -O on rails plugin new | Piotr Sarnacki | 2012-06-08 | 2 | -0/+10 | |
| |/ / | | | | | | | (closes #6672) | |||||
| * | | Merge pull request #6597 from frodsan/am_include_root_to_false | Rafael Mendonça França | 2012-06-07 | 1 | -4/+4 | |
| |\ \ | | | | | | | change AMS::JSON.include_root_in_json default value to false | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |