aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* rm `same_host?`. The same conditional is two lines down.Aaron Patterson2014-06-111-5/+3
|
* Revert "rm `same_host?`. The same conditional is two lines down."Aaron Patterson2014-06-111-5/+8
| | | | This reverts commit 79469b4b0c05a50e19699bc9b568042add2d4987.
* rm `same_host?`. The same conditional is two lines down.Aaron Patterson2014-06-111-8/+5
|
* Revert "remove unnecssary require of `to_param`, as `to_query` is already ↵Rafael Mendonça França2014-06-114-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-requireRafael Mendonça França2014-06-113-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 Aggarwal2014-06-123-3/+0
| | | | | | | | `to_param`
* | Merge pull request #15648 from kuldeepaggarwal/fix-warningsRafael Mendonça França2014-06-112-3/+0
|\ \ | |/ |/| remove warnings
| * remove warningsKuldeep Aggarwal2014-06-122-3/+0
| | | | | | | | warning: assigned but unused variable - scope_called, path and strexp
* | cache host on the stack so we only look it up onceAaron Patterson2014-06-111-8/+9
| |
* | only pull :protocol from the options hash onceAaron Patterson2014-06-111-2/+3
| |
* | cache protocol on the stack to reduce options hash lookupsAaron Patterson2014-06-111-7/+7
| |
* | eliminate nil checks in normalize_portAaron Patterson2014-06-111-7/+7
| |
* | reduce hash lookups and disconnect normalize_port from the options hashAaron Patterson2014-06-111-9/+9
| |
* | Merge pull request #15646 from aditya-kapoor/correct-conversion-docsZachary Scott2014-06-111-5/+12
|\ \ | |/ |/| [ci skip] correct docs for conversion
| * [ci skip] correct docs for conversionAditya Kapoor2014-06-111-5/+12
| |
* | Merge pull request #15644 from akshay-vishnoi/activesupportRafael Mendonça França2014-06-111-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.rbAkshay Vishnoi2014-06-111-1/+0
| |
* | Merge pull request #15643 from aditya-kapoor/add-testRafael Mendonça França2014-06-111-0/+4
|\ \ | | | | | | [ci skip] add test for ActionModel::Conversion
| * | [ci skip] add tests for ActionModel::ConversionAditya Kapoor2014-06-111-0/+4
|/ /
* | Merge pull request #15642 from akshay-vishnoi/activesupportRafael Mendonça França2014-06-111-0/+0
|\| | | | | Move tests for blank.rb under Object
| * Move test for blank.rb under objectAkshay Vishnoi2014-06-111-0/+0
|/
* Merge pull request #15582 from sgrif/sg-timestampsRafael Mendonça França2014-06-111-3/+5
|\ | | | | Refactor determination of max updated timestamp
| * Refactor determination of max updated timestampSean Griffin2014-06-091-3/+5
| | | | | | | | `[].max # => nil`
* | Merge pull request #15630 from eileencodes/refactor-join-keys-on-add_constraintsMatthew Draper2014-06-122-12/+20
|\ \ | | | | | | begin refactoring add_constraints by moving join keys
| * | begin refactoring add_constraints by moving join keyseileencodes2014-06-102-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-attributesRafael Mendonça França2014-06-113-73/+24
|\ \ \ | | | | | | | | rm cached attributes
| * | | rm cached attributesSean Griffin2014-06-113-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_addRafael Mendonça França2014-06-111-0/+1
|\ \ \ \ | | | | | | | | | | Add has_one? docs
| * | | | Add has_one? docs [skip ci]Arthur Neves2014-06-111-0/+1
| | | | |
* | | | | Merge pull request #15628 from akshay-vishnoi/test-casesYves Senn2014-06-111-0/+4
|\ \ \ \ \ | |/ / / / |/| | | | Add test cases for #in? and #presence_in
| * | | | Add test cases for #in? and #presence_inAkshay Vishnoi2014-06-111-0/+4
| | | | |
* | | | | Merge pull request #15637 from akshay-vishnoi/delete-deprecated-methodSantiago Pastorino2014-06-111-4/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove deprecation warning
| * | | | | Remove deprecation warningAkshay Vishnoi2014-06-111-4/+0
| | |_|/ / | |/| | |
* | | | | Merge pull request #15638 from sgrif/sg-column-typesRafael Mendonça França2014-06-111-6/+10
|\ \ \ \ \ | | | | | | | | | | | | Ensure `column_types` returns a type object, and not a column
| * | | | | Ensure `column_types` returns a type object, and not a columnSean Griffin2014-06-111-6/+10
| | |_|/ / | |/| | |
* | | | | Merge pull request #15639 from sgrif/sg-column-serializationRafael Mendonça França2014-06-111-6/+2
|\ \ \ \ \ | |/ / / / |/| | | | Remove YAML serialization workaround for columns
| * | | | Remove YAML serialization workaround for columnsSean Griffin2014-06-111-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 Senn2014-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Follow up to #15636. /cc @hundredwatt
* | | | Merge pull request #15636 from hundredwatt/patch-1Yves Senn2014-06-111-2/+4
|\ \ \ \ | | | | | | | | | | Fix Apache Directives [ci skip]
| * | | | Fix Apache Directives [ci skip]Jason Nochlin2014-06-111-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 Dev2014-06-111-1/+1
| | | |
* | | | Merge pull request #15635 from kuldeepaggarwal/add-missing-changelogYves Senn2014-06-111-0/+6
|\ \ \ \ | |/ / / |/| | | | | | | add missing changelog entry. refer [#16db90d] [ci skip]
| * | | add missing changelog entry. refer [#16db90d] [ci skip]Kuldeep Aggarwal2014-06-111-0/+4
|/ / /
* | | remove deprecated code. Rely on `describe` provided by minitestAaron Patterson2014-06-101-24/+0
| | |
* | | Merge pull request #15621 from sgrif/sg-column-type-decorationsRafael Mendonça França2014-06-102-2/+1
|\ \ \ | | | | | | | | No need to decorate columns twice
| * | | No need to decorate columns twiceSean Griffin2014-06-102-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-docRafael Mendonça França2014-06-101-1/+7
|\ \ \ \ | | | | | | | | | | [ci skip] Fix doc for javascript_helper
| * | | | [ci skip] Fix doc for javascript_helperAditya Kapoor2014-06-111-1/+7
| | | | |
* | | | | Merge pull request #15620 from aditya-kapoor/correct-bundler-linkZachary Scott2014-06-101-4/+3
|\ \ \ \ \ | |/ / / / |/| | | | Correct Bundler link [ci skip]
| * | | | Correct Bundler link [ci skip]Aditya Kapoor2014-06-111-4/+3
|/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 16:14:54 +0000