aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Following documentation guidelineRafael Mendonça França2014-05-141-4/+3
|
* Refactoring the code to make consitional return explicitRafael Mendonça França2014-05-141-4/+9
|
* Follow the documentation guidelineRafael Mendonça França2014-05-141-1/+1
|
* Mark _prefix as nodocRafael Mendonça França2014-05-141-3/+2
| | | | These methods are private API.
* ._prefix is private API so we should not recommend to override itRafael Mendonça França2014-05-141-2/+2
|
* Improve CHANGELOG entryRafael Mendonça França2014-05-141-2/+4
|
* Merge remote-tracking branch 'apotonick/simplify-prefixes'Rafael Mendonça França2014-05-143-15/+75
|\ | | | | | | | | | | This is the rebased version of #15026 Closes #15026
| * deprecate AbC:Base::parent_prefixes.Nick Sutterer2014-05-133-4/+69
| | | | | | | | | | | | rename ::_local_prefixes to ::local_prefixes to state the public attribute. document the latter. make ::local_prefixes private, test overriding it and remove documentation for overriding ::_parent_prefixes.
| * simplify AC:ViewPaths::_prefixes. by making it recursively traversing up the ↵Nick Sutterer2014-05-131-15/+10
| | | | | | | | inheritance chain, classes can override local prefixes.
* | Merge pull request #14833 from jyao6/attribute_inheritanceMatthew Draper2014-05-143-5/+37
|\ \ | | | | | | | | | Fixed Attribute Inheritance Issue
| * | Fix inheritance of stored_attributes (fixes #14672)Jessica Yao2014-05-143-5/+37
|/ / | | | | | | [Brad Bennett, Jessica Yao, & Lakshmi Parthasarathy]
* | Merge pull request #15102 from azul/patch-1Yves Senn2014-05-141-1/+1
|\ \ | | | | | | Fix reference to sanitize helper test suite [ci skip]
| * | minor: point to the right test suite locationazul2014-05-141-1/+1
|/ /
* | Merge pull request #15099 from eileencodes/refactor_delete_records_methodAaron Patterson2014-05-133-16/+20
|\ \ | | | | | | Refactor delete_records method
| * | remove count vareileencodes2014-05-131-4/+2
| | | | | | | | | | | | this change was unneccsary as nothing was gained from it
| * | rename delete_all_records to delete_or_nullify_all_recordseileencodes2014-05-133-8/+4
| | | | | | | | | | | | | | | | | | | | | Rename delete_all_records because this name better describes what the method is doing. We can then remove :all from the hm:t version and pull out the unoptimized call to load_target in delete_records and pass it directly.
| * | remove need for :all symboleileencodes2014-05-131-13/+6
| | | | | | | | | | | | | | | | | | Refactor delete_count method to only handle delete_all or nullify/nil cases and not destroy and switch to if/else rather than case statement. This refactoring allows removal of :all symbol usage.
| * | begin refactoring delete_records methodeileencodes2014-05-133-13/+30
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor by creating two methods delete_all_records and delete_records to be called by delete_all and delete (or destroy) respectively. This reduces the number of conditionals required to handle _how_ records get deleted. The new delete_count method handles how scope is applied to which delete action. A delete_all_records method also has to be called in has_many_through association because of how the methods are chained. This will be refactored later on.
* | Merge pull request #15100 from ↵Godfrey Chan2014-05-132-6/+4
|\ \ | | | | | | | | | | | | eileencodes/remove-deprecation-warning-no-longer-needed remove deprecation warning
| * | remove deprecation warningeileencodes2014-05-132-6/+4
| | | | | | | | | | | | | | | This deprecation was released in 4.1.0 and can be removed for 4.2.0, deprecation message / handling is no longer necessary.
* | | _recall should be set to a hash or not setAaron Patterson2014-05-132-4/+4
| | | | | | | | | | | | Then we can avoid nil checks
* | | we never call url_for with a block, so rmAaron Patterson2014-05-131-1/+0
|/ /
* | drop || test for cases that do not need itAaron Patterson2014-05-132-4/+6
| |
* | no need to check for presence, script names can be blankAaron Patterson2014-05-131-2/+2
| |
* | extend with a module then use define_methodAaron Patterson2014-05-131-7/+4
| | | | | | | | no need for redefine_method
* | this method should always have a parameter passed to it, so remove the defaultAaron Patterson2014-05-131-1/+1
| |
* | options should always be passed to url_forAaron Patterson2014-05-131-2/+2
| |
* | Merge pull request #15092 from kares/pg-array-parserRafael Mendonça França2014-05-132-27/+27
|\ \ | | | | | | [postgres] include PgArrayParser directly
| * | [postgres] include PgArrayParser directly and only load/include ArrayParser ↵kares2014-05-132-27/+27
| | | | | | | | | | | | if not found
* | | Merge pull request #15095 from JuanitoFatas/doc/generatorsRafael Mendonça França2014-05-131-2/+2
|\ \ \ | | | | | | | | [ci skip] Fix two factual errors and highlight code in generators guide.
| * | | [ci skip] Fix a factual error and highlight code in generators guide.Juanito Fatas2014-05-141-2/+2
| | | |
* | | | Merge pull request #15072 from mjtko/fix/issue-15064Rafael Mendonça França2014-05-133-1/+14
|\ \ \ \ | | | | | | | | | | [Fixes #15064] Calling number_to_delimited on a ActiveSupport::SafeBuffer results in mangled output
| * | | | Require active_support/core_ext/string/output_safety and use html_safe ↵Mark J. Titorenko2014-05-121-1/+2
| | | | | | | | | | | | | | | | | | | | rather than use non-public SafeBuffer API.
| * | | | Use block parameter rather than `$1` during `gsub!` so ↵Mark J. Titorenko2014-05-123-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveSupport::SafeBuffer` values aren't mangled. Fixes #15064
* | | | | Merge pull request #15073 from ifyouseewendy/masterRafael Mendonça França2014-05-131-5/+32
|\ \ \ \ \ | | | | | | | | | | | | Update and add tests in array_ext_test.rb
| * | | | | Update require in `array_ext_test.rb`wendi2014-05-131-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Removed `FIMXE` tag to require necessary file but not the whole core_ext
| * | | | | Update and add tests in array_ext_test.rbwendi2014-05-131-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix `test_to_with_instruct` typo to `test_to_xml_with_instruct` - Rename `test_to_xml` to `test_to_xml_with_hash_elements` to make test name more specific. - Add `test_to_xml_with_non_hash_elements` and `test_to_xml_with_non_hash_different_type_elements` `to_xml` behaves different when containing elements are same and different types. - Add `test_to_xml_with_indent_set`
* | | | | | calls with :host should still use the optimized pathAaron Patterson2014-05-131-2/+2
| | | | | |
* | | | | | Merge pull request #15094 from gsamokovarov/patch-1Rafael Mendonça França2014-05-131-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Remove falsy deprecation note in AS guides [ci skip]
| * | | | | Remove falsy deprecation note in AS guides [ci skip]Genadi Samokovarov2014-05-131-1/+1
| | | | | | | | | | | | | | | | | | This is no longer true as @jeremy removed the deprecation in 7a5601c.
* | | | | | use fewer method calls to determine the url_for optionsAaron Patterson2014-05-131-5/+4
| | | | | |
* | | | | | just merge instead of dup and mergeAaron Patterson2014-05-131-2/+1
| | | | | |
* | | | | | the :only_path option is applied by the time the helper is calledAaron Patterson2014-05-131-4/+1
| | | | | |
* | | | | | options already have symbolized keys, so we can avoid this callAaron Patterson2014-05-131-1/+1
|/ / / / /
* | | | | Merge pull request #15091 from printercu/patch-5Andrew White2014-05-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Do not check defined?(CGI) on every call #to_query
| * | | | | Do not check defined?(CGI) on every call #to_queryprintercu2014-05-131-1/+1
| | | | | |
* | | | | | Fix assertion order and :scissors: extra spacesCarlos Antonio da Silva2014-05-132-4/+3
| | | | | |
* | | | | | Merge pull request #15068 from josepjaume/patch-1Aaron Patterson2014-05-132-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dup options hash to prevent modifications
| * | | | | | Dup options hash to prevent modificationsJosep Jaume Rey2014-05-132-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `options[:default]` and `options[:raise]` can be mistakenly added to the `options` hash. This can be a problem if you're reusing the same object.
* | | | | | | pg, clarify default behavior for composite types.Yves Senn2014-05-131-7/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * by default composite types are mapped as `OID::Identity` and issue a warning * the user is advised to register his own `OID::Type` to make use of composite types Registering a new `OID::Type` does currently not allow to specify the type casting behavior when writing to the database. In order for it to work we need to use the values within `@attributes`. They are already being type casted and are ready to be written to the DB. See https://github.com/rails/rails/blob/57643c961feb24b662620d330e71103a830003e8/activerecord/lib/active_record/attribute_methods.rb#L460-L462