Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ci skip]add updated information, ref[#522c0fd] | Kuldeep Aggarwal | 2014-05-14 | 1 | -0/+2 |
| | |||||
* | We need an explicit return | Rafael Mendonça França | 2014-05-14 | 1 | -4/+4 |
| | | | | | | | | | | | If we don't return early Ruby will memoize the value of the prefix of the parent class what will make the subsequent searchs to not work as expected. If the early return we are avoiding the memoization. But when using the deprecated path we need to memoize the value, so we are not using early return for the deprecated path. | ||||
* | Following documentation guideline | Rafael Mendonça França | 2014-05-14 | 1 | -4/+3 |
| | |||||
* | Refactoring the code to make consitional return explicit | Rafael Mendonça França | 2014-05-14 | 1 | -4/+9 |
| | |||||
* | Follow the documentation guideline | Rafael Mendonça França | 2014-05-14 | 1 | -1/+1 |
| | |||||
* | Mark _prefix as nodoc | Rafael Mendonça França | 2014-05-14 | 1 | -3/+2 |
| | | | | These methods are private API. | ||||
* | ._prefix is private API so we should not recommend to override it | Rafael Mendonça França | 2014-05-14 | 1 | -2/+2 |
| | |||||
* | Improve CHANGELOG entry | Rafael Mendonça França | 2014-05-14 | 1 | -2/+4 |
| | |||||
* | Merge remote-tracking branch 'apotonick/simplify-prefixes' | Rafael Mendonça França | 2014-05-14 | 3 | -15/+75 |
|\ | | | | | | | | | | | This is the rebased version of #15026 Closes #15026 | ||||
| * | deprecate AbC:Base::parent_prefixes. | Nick Sutterer | 2014-05-13 | 3 | -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 Sutterer | 2014-05-13 | 1 | -15/+10 |
| | | | | | | | | inheritance chain, classes can override local prefixes. | ||||
* | | Merge pull request #14833 from jyao6/attribute_inheritance | Matthew Draper | 2014-05-14 | 3 | -5/+37 |
|\ \ | | | | | | | | | | Fixed Attribute Inheritance Issue | ||||
| * | | Fix inheritance of stored_attributes (fixes #14672) | Jessica Yao | 2014-05-14 | 3 | -5/+37 |
|/ / | | | | | | | [Brad Bennett, Jessica Yao, & Lakshmi Parthasarathy] | ||||
* | | Merge pull request #15102 from azul/patch-1 | Yves Senn | 2014-05-14 | 1 | -1/+1 |
|\ \ | | | | | | | Fix reference to sanitize helper test suite [ci skip] | ||||
| * | | minor: point to the right test suite location | azul | 2014-05-14 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #15099 from eileencodes/refactor_delete_records_method | Aaron Patterson | 2014-05-13 | 3 | -16/+20 |
|\ \ | | | | | | | Refactor delete_records method | ||||
| * | | remove count var | eileencodes | 2014-05-13 | 1 | -4/+2 |
| | | | | | | | | | | | | this change was unneccsary as nothing was gained from it | ||||
| * | | rename delete_all_records to delete_or_nullify_all_records | eileencodes | 2014-05-13 | 3 | -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 symbol | eileencodes | 2014-05-13 | 1 | -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 method | eileencodes | 2014-05-13 | 3 | -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 Chan | 2014-05-13 | 2 | -6/+4 |
|\ \ | | | | | | | | | | | | | eileencodes/remove-deprecation-warning-no-longer-needed remove deprecation warning | ||||
| * | | remove deprecation warning | eileencodes | 2014-05-13 | 2 | -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 set | Aaron Patterson | 2014-05-13 | 2 | -4/+4 |
| | | | | | | | | | | | | Then we can avoid nil checks | ||||
* | | | we never call url_for with a block, so rm | Aaron Patterson | 2014-05-13 | 1 | -1/+0 |
|/ / | |||||
* | | drop || test for cases that do not need it | Aaron Patterson | 2014-05-13 | 2 | -4/+6 |
| | | |||||
* | | no need to check for presence, script names can be blank | Aaron Patterson | 2014-05-13 | 1 | -2/+2 |
| | | |||||
* | | extend with a module then use define_method | Aaron Patterson | 2014-05-13 | 1 | -7/+4 |
| | | | | | | | | no need for redefine_method | ||||
* | | this method should always have a parameter passed to it, so remove the default | Aaron Patterson | 2014-05-13 | 1 | -1/+1 |
| | | |||||
* | | options should always be passed to url_for | Aaron Patterson | 2014-05-13 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #15092 from kares/pg-array-parser | Rafael Mendonça França | 2014-05-13 | 2 | -27/+27 |
|\ \ | | | | | | | [postgres] include PgArrayParser directly | ||||
| * | | [postgres] include PgArrayParser directly and only load/include ArrayParser ↵ | kares | 2014-05-13 | 2 | -27/+27 |
| | | | | | | | | | | | | if not found | ||||
* | | | Merge pull request #15095 from JuanitoFatas/doc/generators | Rafael Mendonça França | 2014-05-13 | 1 | -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 Fatas | 2014-05-14 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #15072 from mjtko/fix/issue-15064 | Rafael Mendonça França | 2014-05-13 | 3 | -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. Titorenko | 2014-05-12 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | rather than use non-public SafeBuffer API. | ||||
| * | | | | Use block parameter rather than `$1` during `gsub!` so ↵ | Mark J. Titorenko | 2014-05-12 | 3 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveSupport::SafeBuffer` values aren't mangled. Fixes #15064 | ||||
* | | | | | Merge pull request #15073 from ifyouseewendy/master | Rafael Mendonça França | 2014-05-13 | 1 | -5/+32 |
|\ \ \ \ \ | | | | | | | | | | | | | Update and add tests in array_ext_test.rb | ||||
| * | | | | | Update require in `array_ext_test.rb` | wendi | 2014-05-13 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Removed `FIMXE` tag to require necessary file but not the whole core_ext | ||||
| * | | | | | Update and add tests in array_ext_test.rb | wendi | 2014-05-13 | 1 | -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 path | Aaron Patterson | 2014-05-13 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #15094 from gsamokovarov/patch-1 | Rafael Mendonça França | 2014-05-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Remove falsy deprecation note in AS guides [ci skip] | ||||
| * | | | | | Remove falsy deprecation note in AS guides [ci skip] | Genadi Samokovarov | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | This is no longer true as @jeremy removed the deprecation in 7a5601c. | ||||
* | | | | | | use fewer method calls to determine the url_for options | Aaron Patterson | 2014-05-13 | 1 | -5/+4 |
| | | | | | | |||||
* | | | | | | just merge instead of dup and merge | Aaron Patterson | 2014-05-13 | 1 | -2/+1 |
| | | | | | | |||||
* | | | | | | the :only_path option is applied by the time the helper is called | Aaron Patterson | 2014-05-13 | 1 | -4/+1 |
| | | | | | | |||||
* | | | | | | options already have symbolized keys, so we can avoid this call | Aaron Patterson | 2014-05-13 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #15091 from printercu/patch-5 | Andrew White | 2014-05-13 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Do not check defined?(CGI) on every call #to_query | ||||
| * | | | | | Do not check defined?(CGI) on every call #to_query | printercu | 2014-05-13 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Fix assertion order and :scissors: extra spaces | Carlos Antonio da Silva | 2014-05-13 | 2 | -4/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #15068 from josepjaume/patch-1 | Aaron Patterson | 2014-05-13 | 2 | -0/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Dup options hash to prevent modifications |