Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | only check named_host? once in normalize_host | Aaron Patterson | 2014-06-12 | 1 | -3/+7 |
| | |||||
* | lookup subdomain from the options hash once, defaulting to true | Aaron Patterson | 2014-06-12 | 1 | -2/+2 |
| | | | | | if the subdomain wasn't specified, it's the same as if specifying :subdomain as `true`, so we can default the value to `true` safely. | ||||
* | only extract domain from the options hash once | Aaron Patterson | 2014-06-12 | 1 | -3/+4 |
| | |||||
* | reduce calls to `named_host?` | Aaron Patterson | 2014-06-12 | 1 | -2/+6 |
| | | | | | `normalize_host` already calls `named_host?`, so there is no reason to test `named_host?` again in the `extract_domain` method. | ||||
* | use Ruby for mocking | Aaron Patterson | 2014-06-12 | 1 | -1/+1 |
| | |||||
* | Merge pull request #15394 from ↵ | Yves Senn | 2014-06-12 | 4 | -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ętrzak | 2014-06-12 | 4 | -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 structure | Wojciech Wnętrzak | 2014-06-01 | 1 | -1/+40 |
| | | |||||
* | | Merge pull request #15590 from ↵ | Yves Senn | 2014-06-12 | 6 | -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 Wan | 2014-06-12 | 7 | -18/+62 |
| | | | |||||
* | | | Merge pull request #15662 from JuanitoFatas/patch/remove-warning | Yves Senn | 2014-06-12 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Removed variable shawdowing warning in actionpack url.rb | ||||
| * | | | Removed warning actionpack url.rb | Juanito Fatas | 2014-06-12 | 1 | -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-require | Yves Senn | 2014-06-12 | 1 | -2/+0 |
|\ \ \ | | | | | | | | | Remove unused require | ||||
| * | | | Remove unused require | Sean Griffin | 2014-06-11 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | We're not longer using `ipaddr` in schema dumper | ||||
* | | | | Merge pull request #15655 from fabianrbz/remove-unused-method-in-test | Yves Senn | 2014-06-12 | 1 | -10/+0 |
|\ \ \ \ | | | | | | | | | | | remove unnused method from test | ||||
| * | | | | remove unnused method from test | Fabian Rodriguez | 2014-06-11 | 1 | -10/+0 |
| | | | | | |||||
* | | | | | Merge pull request #15657 from JohnRiv/guides_asset_pipeline_local | Zachary Scott | 2014-06-11 | 1 | -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 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 #15656 from JohnRiv/guides_asset_pipeline_precompiling | Zachary Scott | 2014-06-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | [ci skip] Updating argument names in default matcher for compiling files | ||||
| * | | | | | Updating argument names in default matcher for compiling files | John Riviello | 2014-06-11 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | to match arguments used in sprockets-rails [ci skip] | ||||
* | | | | | remove useless to_param call | Aaron Patterson | 2014-06-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | extract_subdomain always returns a string, and to_param calls to_s on a string | ||||
* | | | | | only look up the subdomain once | Aaron Patterson | 2014-06-11 | 1 | -3/+4 |
| | | | | | |||||
* | | | | | scheme should contain one or more characters | Aaron Patterson | 2014-06-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | pull the port out of the options hash once | Aaron Patterson | 2014-06-11 | 1 | -2/+3 |
| | | | | | |||||
* | | | | | remove useless nil check | Aaron Patterson | 2014-06-11 | 1 | -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_parameter | Aaron Patterson | 2014-06-11 | 1 | -3/+3 |
|/ / / / | | | | | | | | | | | | | | | | | remove the default parameter since the methods are always called with a parameter | ||||
* | | | | 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 |