aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #6607 from parndt/patch-2Vijay Dev2012-06-031-2/+2
|\ | | | | Updated guide to say Rails 4.0 requires 1.9.3 or higher, not Rails 3.2.
| * Updated guide to say Rails 4.0 requires 1.9.3 or higher, not Rails 3.2.Philip Arndt2012-06-031-2/+2
| |
* | Merge pull request #6605 from amatsuda/ar_merge_association_testJon Leighton2012-06-031-0/+8
|\ \ | |/ |/| a test case that ensures AR::Relation#merge can merge associations
| * a test case that ensures AR::Relation#merge can merge associationsAkira Matsuda2012-06-031-0/+8
|/
* starting with the Rails 4.0 release notesVijay Dev2012-06-021-0/+591
| | | | | | just a consolidation of the changelogs with minimal formatting [ci skip]
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-026-36/+59
|\
| * copy edit AS guide [ci skip]Vijay Dev2012-06-021-7/+5
| |
| * copy edit routing guide [ci skip]Vijay Dev2012-06-021-1/+3
| |
| * fix up the example app for getting started guide [ci skip]Vijay Dev2012-06-026-10/+8
| |
| * better explanations for acts_like?, try and deep_dupHrvoje Šimić2012-06-021-6/+20
| |
| * change welcome_helper.rb to home_helper.rbspyhole2012-06-011-0/+0
| |
| * Update guides/code/getting_started/test/functional/home_controller_test.rbspyhole2012-06-021-1/+1
| |
| * the file name should be changed to home_helper.rbspyhole2012-06-021-1/+1
| |
| * Update guides/code/getting_started/app/controllers/home_controller.rbspyhole2012-06-021-1/+1
| |
| * Update guides/code/getting_started/config/routes.rbspyhole2012-06-021-1/+1
| |
| * routes are viewable in browser (update guides)schneems2012-06-011-2/+2
| | | | | | From the Pull Request #6461
| * update ActiveModel::Dirty documentationFrancesco Rodriguez2012-05-311-24/+35
| |
| * Fix typo [ci skip]Erich Menge2012-05-301-1/+1
| |
* | Revert some ActiveSupport::Callbacks changes.Rafael Mendonça França2012-06-011-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 911a0859ac065aa8e8834ac985353d659c7c7b65 and 30b31f51af6f7094c4a27b086755fc66c368d6fa. Reason: these changes make the Active Model tests fail randomly. Some examples: http://travis-ci.org/#!/rails/rails/jobs/1498992 http://travis-ci.org/#!/rails/rails/jobs/1496948 http://travis-ci.org/#!/rails/rails/jobs/1489985 This script was used to reproduce these breaks: https://gist.github.com/f6828a03ee4d40bffbc3 200 times, 0 failures
* | Allow to use mounted helpers in ActionView::TestCasePiotr Sarnacki2012-06-014-1/+24
| | | | | | | | | | Similarly to 6525002, this allows to use routes helpers for mounted helpers, but this time in ActionView::TestCase
* | minor comment revisionXavier Noria2012-06-011-1/+1
| |
* | Merge pull request #6588 from nbibler/polymorphic_to_modelJosé Valim2012-06-012-2/+34
| | | | | | | | Correct the use of to_model in polymorphic routing
* | Sync CHANGLOG with the 3-2-stable branchRafael Mendonça França2012-06-015-4/+91
| |
* | Include routes.mounted_helpers into integration testsPiotr Sarnacki2012-06-014-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In integration tests, you might want to use helpers from engines that you mounted in your application. It's not hard to add it by yourself, but it's unneeded boilerplate. mounted_helpers are now included by default. That means that given engine mounted like: mount Foo::Engine => "/foo", :as => "foo" you will be able to use paths from this engine in tests this way: foo.root_path #=> "/foo" (closes #6573)
* | Merge pull request #6586 from amatsuda/generator_blank_lineRafael Mendonça França2012-06-012-2/+2
|\ \ | | | | | | remove unneeded blank line from !namespeced? generated controllers
| * | remove unneeded blank line from !namespeced? controller generatorsAkira Matsuda2012-06-012-2/+2
|/ /
* | Merge pull request #6583 from amatsuda/rake_dsl_19Piotr Sarnacki2012-06-011-1/+1
|\ \ | | | | | | Revert "Only include Rake::DSL if it's defined."
| * | Revert "Only include Rake::DSL if it's defined."Akira Matsuda2012-06-011-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 82c3aca17e78d25f217702e530586673f2a219d7. Reason: Ruby 1.9.3 is shipped with Rake > 0.9
* | | Merge pull request #6584 from amatsuda/ar_explain_inspect_readabilityXavier Noria2012-06-011-1/+7
|\ \ \ | | | | | | | | improve readability of AR explain result
| * | | improve readability of AR explain resultAkira Matsuda2012-06-011-1/+7
|/ / /
* | | Merge pull request #6579 from amatsuda/null_relation_modulizeJosé Valim2012-05-313-11/+15
|\ \ \ | |/ / |/| | modulize AR::NullRelation
| * | unused method argumentsAkira Matsuda2012-06-011-7/+6
| | |
| * | modulize AR::NullRelationAkira Matsuda2012-06-013-4/+9
|/ / | | | | | | now we can invoke previously added scope extension methods
* | Rake::DSL should always be availableJeremy Kemper2012-05-311-1/+1
| |
* | Merge branch 'master-sec'Aaron Patterson2012-05-315-4/+65
|\ \ | | | | | | | | | | | | | | | * master-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
| * | Strip [nil] from parameters hash.Aaron Patterson2012-05-302-1/+28
| | | | | | | | | | | | | | | | | | Thanks to Ben Murphy for reporting this! CVE-2012-2660
| * | predicate builder should not recurse for determining where columns.Aaron Patterson2012-05-303-3/+37
| | | | | | | | | | | | | | | | | | Thanks to Ben Murphy for reporting this CVE-2012-2661
* | | Explicitly require rake so its DSL is availableJeremy Kemper2012-05-311-0/+1
| | |
* | | Rake is in 1.9 stdlib, no need for gem depJeremy Kemper2012-05-311-4/+2
| | |
* | | Psych is always available on 1.9Jeremy Kemper2012-05-312-29/+23
| | |
* | | Merge pull request #6571 from ↵Rafael Mendonça França2012-05-313-7/+50
|\ \ \ | | | | | | | | | | | | | | | | jeremyf/extract-force-ssl-filter-logic-to-separate-method Extracted redirect logic from ActionController::Force::ClassMethods.forc...
| * | | Extracted redirect logic from ActionController::Force::ClassMethods.force_sslJeremy Friesen2012-05-313-7/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this patch the existing .force_ssl method handles both defining the filter and handling the logic for performing the redirect. With this patch the logic for redirecting to the HTTPS protocol is separated from the filter logic that determines if a redirect should occur. By separating the two levels of behavior, an instance method for ActionController (i.e. #force_ssl_redirect) is exposed and available for more granular SSL enforcement. Cleaned up indentation.
* | | | Reduce warning messages when running Active Support testsAndrew White2012-05-312-2/+8
| | | | | | | | | | | | | | | | Eliminate the warnings generated by redefining methods and constants.
* | | | Merge pull request #6566 from arunagw/add-javascripts-to-rake-stats-taskRafael Mendonça França2012-05-312-2/+10
|\ \ \ \ | |/ / / |/| | | Add code statistics for Javascript and CoffeeScript files
| * | | Add code statistics for Javascript andArun Agrawal2012-05-312-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | CoffeeScript files to `rake stats` task Orignal PR was #2270 Thanks to @nfm
* | | | Fix changelog example for count method with block [ci skip]Carlos Antonio da Silva2012-05-311-1/+1
| | | | | | | | | | | | | | | | Missed that too, thanks again @splattael.
* | | | Fix wrong example for count method with block [ci skip]Carlos Antonio da Silva2012-05-311-1/+1
| | | | | | | | | | | | | | | | Thanks @splattael.
* | | | Simplify link_to using content_tagCarlos Antonio da Silva2012-05-312-12/+26
| | | | | | | | | | | | | | | | Add some tests for link_to with blocks and escaping content.
* | | | Make link_to arguments explicitCarlos Antonio da Silva2012-05-311-8/+4
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-29 21:30:56 +0000