aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Ensure that mass assignment options are preservedAndrew White2012-06-104-11/+55
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two possible scenarios where the @mass_assignment_options instance variable can become corrupted: 1. If the assign_attributes doesn't complete correctly, then subsequent calls to a nested attribute assignment method will use whatever options were passed to the previous assign_attributes call. 2. With nested assign_attributes calls, the inner call will overwrite the current options. This will only affect nested attributes as the attribute hash is sanitized before any methods are called. To fix this we save the current options in a local variable and then restore these options in an ensure block.
* | | | Merge pull request #6694 from arunagw/build_fix_masterJosé Valim2012-06-101-1/+1
|\ \ \ \ | | | | | | | | | | Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fba
| * | | | Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fbaArun Agrawal2012-06-101-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-105-5/+10
| | | | |
* | | | | Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-106-0/+74
|\ \ \ \ \ | | | | | | | | | | | | 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-095-4/+40
| | | | | | | | | | | | | | | | | | 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.
| * | | | | add convenience methods for checking migrationsschneems2012-06-032-0/+23
| | | | | | | | | | | | | | | | | | if a rails project needs to be migrated ActiveRecord::Migrator.needs_migration? will be true or false if the current version matches the last version.
* | | | | | Merge pull request #6683 from stevecj/fix-fragile-assert-queriesRafael Mendonça França2012-06-095-25/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix fragile #assert_queries implementation and usages.
| * | | | | | Fix fragile #assert_queries implementation and usages.Steve Jorgensen2012-06-095-25/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several tests that passed when run in the order they are loaded by rake test were failing when run in different sequences due to problems with the implementation of assert_queries and assert_no_queries as well as incorrect assumptions made about how many queries might be executed by a database adapter in various cases.
* | | | | | | removes the obsolete require_association method from dependenciesXavier Noria2012-06-103-21/+7
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an obsolete method from the very early days, apparently it was used circa 2004 because STI support was not smart enough. This method is not public interface, and we are heading a major version, so removal seems right.
* | | | | | Remove conditional committed by accidentSantiago Pastorino2012-06-091-1/+1
| | | | | |
* | | | | | Use each_with_object instead of each hereSantiago Pastorino2012-06-092-4/+4
| | | | | |
* | | | | | Merge pull request #6687 from tiegz/3-2-optimizationsJosé Valim2012-06-091-1/+3
| |_|/ / / |/| | | | | | | | | | | | | | ActiveRecord#attributes optimization: minimize objects created
* | | | | Fix tests, active_authorizer shouldn't include blank valuesPiotr Sarnacki2012-06-091-1/+1
|/ / / / | | | | | | | | | | | | Fix for a test failing after: 00ff0a6776
* | | | Merge pull request #6668 from pomnikita/masterPiotr Sarnacki2012-06-082-1/+7
|\ \ \ \ | | | | | | | | | | Compact array of values added to PermissionSet instance
| * | | | Compact array of values added to PermissionSet instanceNikita Pomyashchiy2012-06-082-1/+7
| | | | |
* | | | | 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 #6667 from yahonda/skip_polymorphic_index_with_oracleRafael Mendonça França2012-06-071-0/+3
|\ \ \ \ | | | | | | | | | | Skip two tests with polymorphic if current adapter is Oracle Adapter.
| * | | | Skip two tests with polymorphic if current adapter is Oracle Adapter.Yasuo Honda2012-06-081-0/+3
| |/ / / | | | | | | | | | | | | because Oracle Adapter does not support foreign keys if :polymorphic => true is used.
* | | | Merge pull request #6597 from frodsan/am_include_root_to_falseRafael Mendonça França2012-06-074-98/+115
|\ \ \ \ | |/ / / |/| | | change AMS::JSON.include_root_in_json default value to false
| * | | change AMS::JSON.include_root_in_json default value to falseFrancesco Rodriguez2012-06-064-98/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #6629 from marcandre/destroyCarlos Antonio da Silva2012-06-065-0/+34
|\ \ \ \ | | | | | | | | | | Add ActiveRecord::Base#destroy!
| * | | | + ActiveRecord::Base#destroy!Marc-Andre Lafortune2012-06-065-0/+34
| | | | |
* | | | | Merge pull request #6645 from amatsuda/reduce_string_instanceCarlos Antonio da Silva2012-06-0613-36/+30
|\ \ \ \ \ | | | | | | | | | | | | Reduce number of String instance
| * | | | | reduce number of StringsAkira Matsuda2012-06-062-2/+2
| | | | | |
| * | | | | no need to to_s here. Both String and Symbol can be interpolated into StringAkira Matsuda2012-06-061-3/+0
| | | | | |
| * | | | | Symbol responds_to :upcase & :downcase in Ruby >= 1.9Akira Matsuda2012-06-065-7/+7
| | | | | |
| * | | | | stop `to_s`ing method namesAkira Matsuda2012-06-066-24/+21
| | | | | | | | | | | | | | | | | | | | | | | | Module#methods are Symbols in Ruby >= 1.9
* | | | | | Merge pull request #6647 from amatsuda/192_minitest_method_nameRafael Mendonça França2012-06-061-2/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | MiniTest::Spec shipped with Ruby >= 1.9.3 always responds_to __name__
| * | | | | MiniTest::Spec shipped with Ruby >= 1.9.3 always responds_to __name__Akira Matsuda2012-06-061-2/+1
|/ / / / /
* | | | | Merge pull request #6644 from amatsuda/fix_meaningless_test_caseAndrew White2012-06-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix meaningless test case
| * | | | | fix meaningless test caseAkira Matsuda2012-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Module#instance_methods returns an Array of Symbols in Ruby >= 1.9 So this was not actually testing anything
* | | | | | Make method name consistent with existing methodsAndrew White2012-06-062-4/+4
| | | | | |
* | | | | | Merge pull request #6643 from fredwu/fix_require_dependencyJosé Valim2012-06-063-6/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fixed the application_controller require_dependency path generated by the app generator
| * | | | | Fixed the application_controller require_dependency path generated by the ↵Fred Wu2012-06-063-6/+9
|/ / / / / | | | | | | | | | | | | | | | app generator
* | | | | Eliminate dependency on Rails::VERSION::STRINGAndrew White2012-06-053-21/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To facilitate the use of ActiveSupport::Testing::Performance outside of a Rails application conditionally check for the presence of Rails::VERSION::STRING before including it in the environment string.
* | | | | Merge pull request #6627 from Vanuan/tests_add_precompile_failure_assertJosé Valim2012-06-051-17/+24
|\ \ \ \ \ | | | | | | | | | | | | bundle exec rake assets:precompile shouldn't fail quietly.
| * | | | | bundle exec rake assets:precompile shouldn't fail quietly.John Yani2012-06-051-17/+24
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If JavaScript runtime is not installed, execjs fails with error quietly, while tests continue to run. This should not happen since it causes tests to fail for unknown reason (#6621). This commit assures that if JavaScript runtime is not installed, an assertion is raised.
* | | | | Merge pull request #6638 from frodsan/config_accessorRafael Mendonça França2012-06-053-9/+82
|\ \ \ \ \ | | | | | | | | | | | | add instance_accessor option to config_accessor
| * | | | | add instance_accessor option to ActiveSupport::Configurable#config_accessorFrancesco Rodriguez2012-06-053-9/+82
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: * Add `instance_accessor` option to opt out of the instance writer and instance reader methods. * Raises a NameError if the name of the attribute is not valid. * Update documentation and tests. * Add CHANGELOG entry in activesupport.
* | | | | Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3Carlos Antonio da Silva2012-06-051-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Resolver tests fail if mysql adapter not installed
| * | | | | The resolver tests fail if the mysql gem is not installed; this breaksDavid Paschich2012-06-031-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being able to run the sqlite3 tests without that gem. This fix ensures the tests will only run if the mysql gem is installed. A better solution might be to move these tests into the per-adapter tests, and test each adapter's resolver.
* | | | | Merge pull request #6632 from route/one_line_code_for_loggerJosé Valim2012-06-051-5/+1
|\ \ \ \ \ | | | | | | | | | | | | One-liner code for logger in ActionView::Helpers::ControllerHelper
| * | | | | One-liner code for logger in ActionView::Helpers::ControllerHelperDmitry Vorotilin2012-06-051-5/+1
|/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 02:20:55 +0000