Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed extract_limit in class Column to return correct mysql float and ↵ | Aaron Nelson | 2014-05-16 | 3 | -0/+47 |
| | | | | double limits | ||||
* | Revert "Remove ruby-head from allow_failures matrix" | Santiago Pastorino | 2014-05-15 | 1 | -0/+1 |
| | | | | This reverts commit 5d2d301024cc0b17f26f6b454ac22a72f1db8a23. | ||||
* | Remove ruby-head from allow_failures matrix | Santiago Pastorino | 2014-05-15 | 1 | -1/+0 |
| | |||||
* | Merge pull request #15116 from tgxworld/remove_unused_method_in_test | Santiago Pastorino | 2014-05-15 | 1 | -4/+0 |
|\ | | | | | Remove unused method in RouteSet test. | ||||
| * | Remove unused method in RouteSet test. | Guo Xiang Tan | 2014-05-15 | 1 | -4/+0 |
| | | |||||
* | | flexible ruby-oci8 version specification. [Gaurav Sharma] | Yves Senn | 2014-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | Follow up to #15109. /cc @Gaurav2728 | ||||
* | | update ruby-oci8 version specification. Closes #15109. [ci skip] | Yves Senn | 2014-05-15 | 1 | -1/+1 |
|/ | | | | /cc @yahonda | ||||
* | Only path requirements are relevant to optimized urls | Andrew White | 2014-05-15 | 1 | -1/+1 |
| | | | | | The bit of URL generation that is optimized is the generation of the path so things like :host, :port, etc. are irrelevant. | ||||
* | Add missing requires for require 'action_dispatch/routing' | Andrew White | 2014-05-15 | 2 | -0/+3 |
| | |||||
* | :scissors: | Rafael Mendonça França | 2014-05-14 | 3 | -4/+0 |
| | |||||
* | Methods of these modules are internal | Rafael Mendonça França | 2014-05-14 | 2 | -14/+14 |
| | | | | | They should not be used on people application so they should not be present on the API documentation. | ||||
* | Merge pull request #15088 from kares/shareable-modules | Rafael Mendonça França | 2014-05-14 | 11 | -68/+67 |
|\ | | | | | | | [postgres] remove (outer) sub-class declarations with nested modules/classes | ||||
| * | PostgreSQLAdapter::Utils seems to be only used from a single spot - quite ↵ | kares | 2014-05-14 | 4 | -40/+34 |
| | | | | | | | | redundant | ||||
| * | move PostgreSQL's DatabaseStatements out of the PostgreSQLAdapter name-space | kares | 2014-05-14 | 2 | -7/+7 |
| | | |||||
| * | PostgreSQL's SchemaStatements seems a could candidate for re-use (with AR-JDBC) | kares | 2014-05-14 | 2 | -8/+7 |
| | | |||||
| * | introduce AR::ConnectionAdapters::PostgreSQL for sharing modules (with AR-JDBC) | kares | 2014-05-14 | 7 | -15/+21 |
| | | | | | | ... 'shared' OID, ArrayParser and Cast helpers, also re-arranged Column's dependencies | ||||
* | | Don't use Active Support where it is not needed. | Rafael Mendonça França | 2014-05-14 | 1 | -1/+3 |
| | | | | | | | | | | parent_name is a string of nil, never a blank string so we don't need to use presence. | ||||
* | | Merge pull request #14871 from kassio/kb-fixes-namespaced-habtm | Rafael Mendonça França | 2014-05-14 | 7 | -1/+43 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix how to compute class name on habtm namespaced. Conflicts: activerecord/CHANGELOG.md | ||||
| * | | Fix how to compute class name on habtm namespaced. | Kassio Borges | 2014-05-13 | 7 | -1/+42 |
| | | | | | | | | | | | | | | | | | | Thank's for @laurocaetano for the help with tests. :smiley: Fixes #14709 | ||||
* | | | Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_master | Rafael Mendonça França | 2014-05-14 | 5 | -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 strings | Nat Budin | 2014-05-14 | 5 | -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-instrumentation | Rafael Mendonça França | 2014-05-14 | 3 | -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 payload | Daniel Schierbeck | 2014-05-10 | 3 | -1/+31 |
| | | | | | |||||
* | | | | | Merge pull request #15070 from ayamomiji/sse-patch | Aaron Patterson | 2014-05-14 | 2 | -1/+18 |
|\ \ \ \ \ | | | | | | | | | | | | | Add multiple lines message support for SSE module | ||||
| * | | | | | Add multiple lines message support for SSE module | ayaya | 2014-05-12 | 2 | -1/+18 |
| | | | | | | |||||
* | | | | | | rake, remove frontbase related tasks from Active Record Rakefile. | Yves Senn | 2014-05-14 | 1 | -46/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #15110 from kuldeepaggarwal/fix-warning | Rafael Mendonça França | 2014-05-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | remove warning `ambiguous first argument; put parentheses or even spaces` | ||||
| * | | | | | | remove warning `ambiguous first argument; put parentheses or even spaces` | Kuldeep Aggarwal | 2014-05-15 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #15074 from kuldeepaggarwal/docs-changes | Rafael Mendonça França | 2014-05-14 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Add missing information, ref[#522c0fd] | ||||
| * | | | | | | [ci skip]add updated information, ref[#522c0fd] | Kuldeep Aggarwal | 2014-05-14 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #15108 from arthurnn/i18n_master | Rafael Mendonça França | 2014-05-14 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use i18n master to run tests | ||||
| * | | | | | | | Use i18n master to run tests | Arthur Neves | 2014-05-13 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #15096 from robin850/patch-20 | Rafael Mendonça França | 2014-05-14 | 3 | -4/+4 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Update Redcarpet to 3.1.2 | ||||
| * | | | | | | | Update Redcarpet to 3.1.2 | Robin Dupret | 2014-05-14 | 3 | -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 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 |