aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_masterRafael Mendonça França2014-05-145-1/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make filter_binds filter out symbols that are equal to strings Conflicts: activerecord/CHANGELOG.md
| * | | | | Make filter_binds filter out symbols that are equal to stringsNat Budin2014-05-145-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::Relation::Merger's filter_binds method does not filter out bind variables when one of the attribute nodes has a string name, but the other has a symbol name, even when those names are actually equal. This can result in there being more bind variables than placeholders in the generated SQL. This is particularly an issue for PostgreSQL, where this is treated as an error. This patch changes the filter_binds method to make it convert both attribute names to strings before comparing.
* | | | | | Merge pull request #14137 from dasch/better-fragment-cache-instrumentationRafael Mendonça França2014-05-143-1/+31
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add controller and action name to the fragment caching instrumentation payload Conflicts: actionpack/CHANGELOG.md
| * | | | | Add controller and action name to the instrumentation payloadDaniel Schierbeck2014-05-103-1/+31
| | | | | |
* | | | | | Merge pull request #15070 from ayamomiji/sse-patchAaron Patterson2014-05-142-1/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add multiple lines message support for SSE module
| * | | | | | Add multiple lines message support for SSE moduleayaya2014-05-122-1/+18
| | | | | | |
* | | | | | | rake, remove frontbase related tasks from Active Record Rakefile.Yves Senn2014-05-141-46/+0
| | | | | | |
* | | | | | | Merge pull request #15110 from kuldeepaggarwal/fix-warningRafael Mendonça França2014-05-141-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove warning `ambiguous first argument; put parentheses or even spaces`
| * | | | | | | remove warning `ambiguous first argument; put parentheses or even spaces`Kuldeep Aggarwal2014-05-151-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #15074 from kuldeepaggarwal/docs-changesRafael Mendonça França2014-05-141-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Add missing information, ref[#522c0fd]
| * | | | | | | [ci skip]add updated information, ref[#522c0fd]Kuldeep Aggarwal2014-05-141-0/+2
| | | | | | | |
* | | | | | | | Merge pull request #15108 from arthurnn/i18n_masterRafael Mendonça França2014-05-141-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use i18n master to run tests
| * | | | | | | | Use i18n master to run testsArthur Neves2014-05-131-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #15096 from robin850/patch-20Rafael Mendonça França2014-05-143-4/+4
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Update Redcarpet to 3.1.2
| * | | | | | | | Update Redcarpet to 3.1.2Robin Dupret2014-05-143-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version fixes an API breakage between 3.0 and 3.1 ; the header method's arity should not have changed. [ci skip]
* | | | | | | | | We need an explicit returnRafael Mendonça França2014-05-141-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 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 22:58:59 +0000