aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
| * Persist glob when replacing a pathNicholas Mulder2012-06-302-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 routesCarlos Antonio da Silva2012-06-291-10/+0
| | | | | | | | Related with 5e7d6bb
* | Revert "Allow loading external route files from the router"José Valim2012-06-297-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 enginesJosé Valim2012-06-294-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 goneJosé Valim2012-06-295-121/+85
|
* Depend on thor 0.15.4José Valim2012-06-291-1/+1
|
* Rename RouteInspect to RoutesInspector for consistencyJosé Valim2012-06-294-7/+7
|
* Add changelog entry for polymorphic option in model generatorCarlos Antonio da Silva2012-06-271-0/+10
| | | | | Pull request #6856, merged in 52f6e47682003c83b0466bf5e140ee302498a226. [ci skip]
* Merge pull request #6880 from kennyj/fix_20120628Carlos Antonio da Silva2012-06-271-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.kennyj2012-06-281-1/+1
| |
* | Merge pull request #6856 from lexmag/polymorphic_generatorsCarlos Antonio da Silva2012-06-273-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 generatorAleksey Magusev2012-06-273-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-actionmailerAaron Patterson2012-06-262-0/+6
|\ \ | | | | | | Async actionmailer
| * | Updated ChangelogsBrian Cardarella2012-06-231-0/+3
| | |
| * | Add commented out ActionMailer async config optionBrian Cardarella2012-06-231-0/+3
| | |
* | | Change the behavior of db:test:prepare task when schema_format is sql for ↵kennyj2012-06-261-0/+9
| | | | | | | | | | | | consistency.
* | | Change the behavior of db:test:clone task when schema_format is sql for ↵kennyj2012-06-261-0/+9
| |/ |/| | | | | consistency.
* | ruby 1.9 hash syntax for generated codeRichard Huang2012-06-236-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 Rodriguez2012-06-221-1/+1
|
* Run the logger tests in isolationRafael Mendonça França2012-06-191-0/+2
|
* run the notes tests in isolationAaron Patterson2012-06-191-0/+4
|
* run railties tests in parallel, default to 2 coresAaron Patterson2012-06-191-2/+0
|
* join any extra args to the tmp pathAaron Patterson2012-06-191-0/+1
|
* expand the tmpdir to the realpath so tests on OS X passAaron Patterson2012-06-192-2/+2
|
* use system tmpdir rather than our ownAaron Patterson2012-06-193-13/+26
|
* Change minimum (default) log level in PostgreSQL to warning.kennyj2012-06-182-4/+4
|
* Require thor 0.15.3 onwardsJosé Valim2012-06-182-5/+2
|
* Don't read csv file during executing db:fixtures:load.kennyj2012-06-171-0/+12
|
* TestCase does not need to be loaded when loading the frameworkAaron Patterson2012-06-151-1/+10
|
* Fix observers with AR::ModelJon Leighton2012-06-151-0/+21
|
* Fix config.active_record.whitelist_attributes with AR::ModelJon Leighton2012-06-151-3/+4
|
* Merge pull request #6708 from ↵José Valim2012-06-111-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:uncomittedAkira Matsuda2012-06-121-1/+1
| |
* | Merge pull request #6690 from suginoy/fix-templates-copyRafael Mendonça França2012-06-112-1/+12
|\ \ | |/ |/| Fix: 'rake rails:templates:copy' doesn't work
| * Added a testcase for #6690.kennyj2012-06-121-0/+11
| |
| * fix stylesheet template dirSugino Yasuhiro2012-06-091-1/+1
| |
* | Merge pull request #6692 from schneems/schneems/something-went-wrongJosé Valim2012-06-102-0/+2
|\ \ | | | | | | Add Prompt to 404 & 500 Pages to Check Logs in Production
| * | add prompt to 404 & 500 pages to check logsschneems2012-06-092-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 entriesJosé Valim2012-06-102-1/+3
| |
* | Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-103-0/+20
|\ \ | |/ |/| Notify A User they Have Pending Migrations
| * test errors for pending migrationsschneems2012-06-091-0/+15
| | | | | | App should raise error on page_load
| * raise error for pending migration schneems2012-06-092-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 valuesPiotr Sarnacki2012-06-091-1/+1
| | | | | | | | Fix for a test failing after: 00ff0a6776
* | Merge pull request #6681 from arunagw/plugin_gen_fixRafael Mendonça França2012-06-082-3/+9
|\ \ | | | | | | Plugin gen fix
| * | We should not include engine.rake file into rakeArun Agrawal2012-06-082-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 Agrawal2012-06-081-2/+0
| | |
* | | Don't add sqlite3 to gemspec with -O on rails plugin newPiotr Sarnacki2012-06-082-0/+10
|/ / | | | | | | (closes #6672)
* | Merge pull request #6597 from frodsan/am_include_root_to_falseRafael Mendonça França2012-06-071-4/+4
|\ \ | | | | | | change AMS::JSON.include_root_in_json default value to false
| * | change AMS::JSON.include_root_in_json default value to falseFrancesco Rodriguez2012-06-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: * Update `include_root_in_json` default value to false for default value to false for `ActiveModel::Serializers::JSON`. * Remove unnecessary change to include_root_in_json option in wrap_parameters template. * Update `as_json` documentation. * Fix JSONSerialization tests. Problem: It's confusing that AM serializers behave differently from AR, even when AR objects include AM serializers module. class User < ActiveRecord::Base; end class Person include ActiveModel::Model include ActiveModel::AttributeMethods include ActiveModel::Serializers::JSON attr_accessor :name, :age def attributes instance_values end end user.as_json => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true} # root is not included person.as_json => {"person"=>{"name"=>"Francesco", "age"=>22}} # root is included ActiveRecord::Base.include_root_in_json => false Person.include_root_in_json => true # different default values for include_root_in_json Proposal: Change the default value of AM serializers to false, update the misleading documentation and remove unnecessary change to false of include_root_in_json option with AR objects. class User < ActiveRecord::Base; end class Person include ActiveModel::Model include ActiveModel::AttributeMethods include ActiveModel::Serializers::JSON attr_accessor :name, :age def attributes instance_values end end user.as_json => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true} # root is not included person.as_json => {"name"=>"Francesco", "age"=>22} # root is not included ActiveRecord::Base.include_root_in_json => false Person.include_root_in_json => false # same behaviour, more consistent Fixes #6578.
* | | reduce number of StringsAkira Matsuda2012-06-061-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 01:45:20 +0000