aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* use Ruby for mockingAaron Patterson2014-06-121-1/+1
|
* Merge pull request #15394 from ↵Yves Senn2014-06-124-2/+104
|\ | | | | | | | | | | | | | | | | morgoth/fix-automatic-maintaining-test-schema-for-sql-format ActiveRecord::Migration.maintain_test_schema! doesn't work with structure.sql Conflicts: activerecord/CHANGELOG.md
| * Fixed automatic maintaining test schema to properly handle sql structure ↵Wojciech Wnętrzak2014-06-124-3/+64
| | | | | | | | | | | | | | | | | | schema format. Additionally: * It changes `purge` task on `sqlite3` adapter to recreate database file, to be consistent with other adapters. * Adds `purge` step when loading from `schema.rb`
| * Added missing test case for migrations when using sql structureWojciech Wnętrzak2014-06-011-1/+40
| |
* | Merge pull request #15590 from ↵Yves Senn2014-06-126-18/+62
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | zuhao/refactor_actionview_register_template_handler Add unregister_template_handler to prevent leaks. Conflicts: actionview/CHANGELOG.md
| * | Add unregister_template_handler to prevent leaks.Zuhao Wan2014-06-127-18/+62
| | |
* | | Merge pull request #15662 from JuanitoFatas/patch/remove-warningYves Senn2014-06-121-2/+2
|\ \ \ | | | | | | | | Removed variable shawdowing warning in actionpack url.rb
| * | | Removed warning actionpack url.rbJuanito Fatas2014-06-121-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: /Users/Juan/dev/rails/actionpack/lib/action_dispatch/http/url.rb:95: warning: shadowing outer local variable - port After: No warning
* | | Merge pull request #15647 from sgrif/sg-unused-requireYves Senn2014-06-121-2/+0
|\ \ \ | | | | | | | | Remove unused require
| * | | Remove unused requireSean Griffin2014-06-111-2/+0
| | | | | | | | | | | | | | | | We're not longer using `ipaddr` in schema dumper
* | | | Merge pull request #15655 from fabianrbz/remove-unused-method-in-testYves Senn2014-06-121-10/+0
|\ \ \ \ | | | | | | | | | | remove unnused method from test
| * | | | remove unnused method from testFabian Rodriguez2014-06-111-10/+0
| | | | |
* | | | | Merge pull request #15657 from JohnRiv/guides_asset_pipeline_localZachary Scott2014-06-111-5/+4
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] There are 3 caveats to Local Precompilation including 1 config change
| * | | | | There are 3 caveats to Local Precompilation including 1 config changeJohn Riviello2014-06-111-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | not 2 caveats with one of them being 2 config changes [ci skip]
* | | | | | Merge pull request #15656 from JohnRiv/guides_asset_pipeline_precompilingZachary Scott2014-06-111-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [ci skip] Updating argument names in default matcher for compiling files
| * | | | | Updating argument names in default matcher for compiling filesJohn Riviello2014-06-111-1/+1
| |/ / / / | | | | | | | | | | | | | | | to match arguments used in sprockets-rails [ci skip]
* | | | | remove useless to_param callAaron Patterson2014-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | extract_subdomain always returns a string, and to_param calls to_s on a string
* | | | | only look up the subdomain onceAaron Patterson2014-06-111-3/+4
| | | | |
* | | | | scheme should contain one or more charactersAaron Patterson2014-06-111-1/+1
| | | | |
* | | | | pull the port out of the options hash onceAaron Patterson2014-06-111-2/+3
| | | | |
* | | | | remove useless nil checkAaron Patterson2014-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | irb(main):004:0> /foo/ !~ nil => true irb(main):005:0> /foo/ !~ 'bar' => true irb(main):006:0> /foo/ !~ 'foo' => false
* | | | | these methods are always called with a tld_parameterAaron Patterson2014-06-111-3/+3
|/ / / / | | | | | | | | | | | | | | | | remove the default parameter since the methods are always called with a parameter
* | | | Merge pull request #15652 from sgrif/pluck-multiple-named-columnsRafael Mendonça França2014-06-113-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 tablesSean Griffin2014-06-113-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 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-20 23:37:04 +0000