Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | There are 3 caveats to Local Precompilation including 1 config change | John Riviello | 2014-06-11 | 1 | -5/+4 |
| | | | | not 2 caveats with one of them being 2 config changes [ci skip] | ||||
* | Merge pull request #15652 from sgrif/pluck-multiple-named-columns | Rafael Mendonça França | 2014-06-11 | 3 | -3/+15 |
|\ | | | | | Pluck should work with columns of the same name from different tables | ||||
| * | Pluck should work with columns of the same name from different tables | Sean Griffin | 2014-06-11 | 3 | -3/+15 |
|/ | | | | | | | | The column name given by the adapter doesn't include the table namespace, so going through the hashed version of the result set causes overridden keys. Fixes #15649 | ||||
* | rm `same_host?`. The same conditional is two lines down. | Aaron Patterson | 2014-06-11 | 1 | -5/+3 |
| | |||||
* | Revert "rm `same_host?`. The same conditional is two lines down." | Aaron Patterson | 2014-06-11 | 1 | -5/+8 |
| | | | | This reverts commit 79469b4b0c05a50e19699bc9b568042add2d4987. | ||||
* | rm `same_host?`. The same conditional is two lines down. | Aaron Patterson | 2014-06-11 | 1 | -8/+5 |
| | |||||
* | Revert "remove unnecssary require of `to_param`, as `to_query` is already ↵ | Rafael Mendonça França | 2014-06-11 | 4 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | require `to_param`" Revert "No need to require to_param, it is already required in to_query.rb" This reverts commits ccdd97662e1fb00c23c90d59f65c091904959561 and d697ee14264a90a39cdbe87857656d8b314ac9b7. Reason by @jeremy: These requires are not for implementation dependency. They ensure that requiring array conversions provides to_query, to_param, and other array conversion behaviors. The fact that to_query is implemented in terms of to_param is just a coincidence. If to_query removed its to_param require, then someone requiring array conversions would no longer have to_param available. This change removes these intentional dependencies on to_param in favor of implementation side effects—an undesirable move that's susceptible to regression. | ||||
* | Merge pull request #15650 from kuldeepaggarwal/remove-unecessary-require | Rafael Mendonça França | 2014-06-11 | 3 | -3/+0 |
|\ | | | | | remove unnecssary require of `to_param`, as `to_query` is already require `to_param` | ||||
| * | remove unnecssary require of `to_param`, as `to_query` is already require ↵ | Kuldeep Aggarwal | 2014-06-12 | 3 | -3/+0 |
| | | | | | | | | `to_param` | ||||
* | | Merge pull request #15648 from kuldeepaggarwal/fix-warnings | Rafael Mendonça França | 2014-06-11 | 2 | -3/+0 |
|\ \ | |/ |/| | remove warnings | ||||
| * | remove warnings | Kuldeep Aggarwal | 2014-06-12 | 2 | -3/+0 |
| | | | | | | | | warning: assigned but unused variable - scope_called, path and strexp | ||||
* | | cache host on the stack so we only look it up once | Aaron Patterson | 2014-06-11 | 1 | -8/+9 |
| | | |||||
* | | only pull :protocol from the options hash once | Aaron Patterson | 2014-06-11 | 1 | -2/+3 |
| | | |||||
* | | cache protocol on the stack to reduce options hash lookups | Aaron Patterson | 2014-06-11 | 1 | -7/+7 |
| | | |||||
* | | eliminate nil checks in normalize_port | Aaron Patterson | 2014-06-11 | 1 | -7/+7 |
| | | |||||
* | | reduce hash lookups and disconnect normalize_port from the options hash | Aaron Patterson | 2014-06-11 | 1 | -9/+9 |
| | | |||||
* | | Merge pull request #15646 from aditya-kapoor/correct-conversion-docs | Zachary Scott | 2014-06-11 | 1 | -5/+12 |
|\ \ | |/ |/| | [ci skip] correct docs for conversion | ||||
| * | [ci skip] correct docs for conversion | Aditya Kapoor | 2014-06-11 | 1 | -5/+12 |
| | | |||||
* | | Merge pull request #15644 from akshay-vishnoi/activesupport | Rafael Mendonça França | 2014-06-11 | 1 | -1/+0 |
|\ \ | |/ |/| | No need to require to_param, it is already required in object/to_query.rb | ||||
| * | No need to require to_param, it is already required in to_query.rb | Akshay Vishnoi | 2014-06-11 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #15643 from aditya-kapoor/add-test | Rafael Mendonça França | 2014-06-11 | 1 | -0/+4 |
|\ \ | | | | | | | [ci skip] add test for ActionModel::Conversion | ||||
| * | | [ci skip] add tests for ActionModel::Conversion | Aditya Kapoor | 2014-06-11 | 1 | -0/+4 |
|/ / | |||||
* | | Merge pull request #15642 from akshay-vishnoi/activesupport | Rafael Mendonça França | 2014-06-11 | 1 | -0/+0 |
|\| | | | | | Move tests for blank.rb under Object | ||||
| * | Move test for blank.rb under object | Akshay Vishnoi | 2014-06-11 | 1 | -0/+0 |
|/ | |||||
* | Merge pull request #15582 from sgrif/sg-timestamps | Rafael Mendonça França | 2014-06-11 | 1 | -3/+5 |
|\ | | | | | Refactor determination of max updated timestamp | ||||
| * | Refactor determination of max updated timestamp | Sean Griffin | 2014-06-09 | 1 | -3/+5 |
| | | | | | | | | `[].max # => nil` | ||||
* | | Merge pull request #15630 from eileencodes/refactor-join-keys-on-add_constraints | Matthew Draper | 2014-06-12 | 2 | -12/+20 |
|\ \ | | | | | | | begin refactoring add_constraints by moving join keys | ||||
| * | | begin refactoring add_constraints by moving join keys | eileencodes | 2014-06-10 | 2 | -12/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add_constraints is complicated and difficult to read. This is the beginning of a long process of refactoring this code. First step: moved the join keys out of AssociationScope and into reflection. We then don't need to call `reflection` because now reflection is `self`. `foreign_key` must be named something else because reflection already has a `foreign_key` method and when passed into `JoinKeys` it was getting the wrong assignment. `reflection_foreign_key` seemed to be an appropriate name. I also named `key` `reflection_key` to match `reflection_foreign_key`. | ||||
* | | | Merge pull request #15429 from sgrif/sg-rm-cached-attributes | Rafael Mendonça França | 2014-06-11 | 3 | -73/+24 |
|\ \ \ | | | | | | | | | rm cached attributes | ||||
| * | | | rm cached attributes | Sean Griffin | 2014-06-11 | 3 | -73/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original patch that added this concept can be found [here](https://web.archive.org/web/20090601022739/http://dev.rubyonrails.org/ticket/9767). The current default behavior is to cache everything except serialized columns, unless the user specified otherwise. If anyone were to specify otherwise, many types would actually be completely broken. Still, the method is left in place with a deprecation warning in case anyone is actually still calling this method. | ||||
* | | | | Merge pull request #15641 from arthurnn/small_doc_add | Rafael Mendonça França | 2014-06-11 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Add has_one? docs | ||||
| * | | | | Add has_one? docs [skip ci] | Arthur Neves | 2014-06-11 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #15628 from akshay-vishnoi/test-cases | Yves Senn | 2014-06-11 | 1 | -0/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add test cases for #in? and #presence_in | ||||
| * | | | | Add test cases for #in? and #presence_in | Akshay Vishnoi | 2014-06-11 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge pull request #15637 from akshay-vishnoi/delete-deprecated-method | Santiago Pastorino | 2014-06-11 | 1 | -4/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove deprecation warning | ||||
| * | | | | | Remove deprecation warning | Akshay Vishnoi | 2014-06-11 | 1 | -4/+0 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #15638 from sgrif/sg-column-types | Rafael Mendonça França | 2014-06-11 | 1 | -6/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | Ensure `column_types` returns a type object, and not a column | ||||
| * | | | | | Ensure `column_types` returns a type object, and not a column | Sean Griffin | 2014-06-11 | 1 | -6/+10 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #15639 from sgrif/sg-column-serialization | Rafael Mendonça França | 2014-06-11 | 1 | -6/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove YAML serialization workaround for columns | ||||
| * | | | | Remove YAML serialization workaround for columns | Sean Griffin | 2014-06-11 | 1 | -6/+2 |
|/ / / / | | | | | | | | | | | | | | | | | We are no longer including column objects in YAML serialization, thanks to https://github.com/rails/rails/pull/15621 | ||||
* | | | | cleanup, get rid of trailing whitespace. [ci skip] | Yves Senn | 2014-06-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #15636. /cc @hundredwatt | ||||
* | | | | Merge pull request #15636 from hundredwatt/patch-1 | Yves Senn | 2014-06-11 | 1 | -2/+4 |
|\ \ \ \ | | | | | | | | | | | Fix Apache Directives [ci skip] | ||||
| * | | | | Fix Apache Directives [ci skip] | Jason Nochlin | 2014-06-11 | 1 | -2/+4 |
|/ / / / | | | | | | | | | Directives need to be placed on their own lines in order to work. Tested on: `Server version: Apache/2.2.22 (Ubuntu); Server built: Mar 19 2014 21:11:15` | ||||
* | | | | fix typo in changelog [ci skip] | Vijay Dev | 2014-06-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #15635 from kuldeepaggarwal/add-missing-changelog | Yves Senn | 2014-06-11 | 1 | -0/+6 |
|\ \ \ \ | |/ / / |/| | | | | | | | add missing changelog entry. refer [#16db90d] [ci skip] | ||||
| * | | | add missing changelog entry. refer [#16db90d] [ci skip] | Kuldeep Aggarwal | 2014-06-11 | 1 | -0/+4 |
|/ / / | |||||
* | | | remove deprecated code. Rely on `describe` provided by minitest | Aaron Patterson | 2014-06-10 | 1 | -24/+0 |
| | | | |||||
* | | | Merge pull request #15621 from sgrif/sg-column-type-decorations | Rafael Mendonça França | 2014-06-10 | 2 | -2/+1 |
|\ \ \ | | | | | | | | | No need to decorate columns twice | ||||
| * | | | No need to decorate columns twice | Sean Griffin | 2014-06-10 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We never want result types to override column types, and `decorate_columns` can only affect column types. No need to go through the decoration multiple times, we can just exclude the column types from the result types instead. | ||||
* | | | | Merge pull request #15619 from aditya-kapoor/fix-js-doc | Rafael Mendonça França | 2014-06-10 | 1 | -1/+7 |
|\ \ \ \ | | | | | | | | | | | [ci skip] Fix doc for javascript_helper |