aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* pg guide, minor copy editsYves Senn2014-06-131-2/+4
|
* Set the status before of setting the response bodyGuillermo Iguaran2014-06-131-2/+2
| | | | | | | The 401 status should be set first because setting the response body in a live controller also closes the response to further changes. Fixes #14229.
* Merge pull request #15680 from akshay-vishnoi/doc_changesSean Griffin2014-06-121-1/+1
|\ | | | | [ci skip] BigDecimal#duplicable? returns false in 1.9.x
| * [ci skip] BigDecimal#duplicable? returns false in 1.9.xAkshay Vishnoi2014-06-131-1/+1
| |
* | Merge pull request #15678 from sgrif/sg-test-hashMatthew Draper2014-06-131-0/+7
|\ \ | | | | | | Add a test to ensure we don't get a performance regression on #hash
| * | Add a test to ensure we don't get a performance regression on #hashSean Griffin2014-06-121-0/+7
| | |
* | | Merge pull request #15677 from sgrif/sg-less-imperative-pkMatthew Draper2014-06-131-3/+4
|\ \ \ | | | | | | | | Use a conditional rather than early return in `id`
| * | | Use a conditional rather than early return in `id`Sean Griffin2014-06-121-3/+4
| |/ /
* | | Merge pull request #15676 from sgrif/sg-object-hashMatthew Draper2014-06-131-1/+5
|\ \ \ | |/ / |/| | Defer to super, rather than re-implementing Object#hash
| * | Defer to super, rather than re-implementing Object#hashSean Griffin2014-06-121-1/+5
|/ /
* | Merge pull request #15665 from sgrif/sg-id-perfSean Griffin2014-06-122-1/+2
|\ \ | | | | | | Fix performance regression on preloading HABTM associations
| * | Fix performance regression on preloading HABTM associationsSean Griffin2014-06-122-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'd spend a lot of time calling `hash` and `eql?` on the join model, which has no primary key. Calling `id` with no primary key is a really slow way to get back `nil`, so we can improve the performance there. However, even with the escape clause, we *still* weren't getting high enough performance, as we were checking the primary key too much. `hash` will always return `nil.hash` for records with no id, and `==` will always return `false`. We can optimize those cases in the HABTM join model.
* | | Merge pull request #15654 from pdg137/masterMatthew Draper2014-06-135-7/+51
|\ \ \ | | | | | | | | | | | | In tag helper, honor html_safe on arrays; also make safe_join more similar to Array.join
| * | | In tag helper, honor html_safe on array parameters; also make safe_join more ↵Paul Grayson2014-06-124-8/+51
| | | | | | | | | | | | | | | | similar to Array.join by first calling flatten.
* | | | Merge pull request #15667 from samdec/mailer_doc_bug_fixSean Griffin2014-06-121-1/+1
|\ \ \ \ | | | | | | | | | | fix bug in email with name example code
| * | | | fix bug in email with name example codeSam DeCesare2014-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The display name in the email "to" field needs to be quoted otherwise your email-sending service will fail when trying to deliver mail to user's with commas in their name (i.e. John Smith, M.D.).
* | | | | Merge pull request #15666 from akshay-vishnoi/doc_changesSean Griffin2014-06-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Correct output of #assert_not
| * | | | | [ci skip] Correct output of #assert_notAkshay Vishnoi2014-06-121-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #15672 from sgrif/sg-topics-contentMatthew Draper2014-06-132-11/+11
|\ \ \ \ \ | | | | | | | | | | | | Update test data which doesn't reflect expected usage
| * | | | | Update test data which doesn't reflect expected usageSean Griffin2014-06-122-11/+11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Topics call `serialize :content`, which means that the values in the database should be YAML encoded, and we would only expect to receive YAML strings to `update_column` and `update_columns`.
* | | | | only check named_host? once in normalize_hostAaron Patterson2014-06-121-3/+7
| | | | |
* | | | | lookup subdomain from the options hash once, defaulting to trueAaron Patterson2014-06-121-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 onceAaron Patterson2014-06-121-3/+4
| | | | |
* | | | | reduce calls to `named_host?`Aaron Patterson2014-06-121-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 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 05:21:24 +0000