aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Reword PreparedStatementInvalid example, and use values instead ofZachary Scott2014-06-131-4/+3
| | | | | variables [ci skip] Thanks to @matthewd for the excellent feedback! :heart:
* Revert code changes at "Copy edits and code font wrap for Active Record [ci ↵Rafael Mendonça França2014-06-131-1/+7
| | | | | | | | skip]" This partially reverts commit 1a203d5e07f639332880099fab610b886b1742fc. Reason: It was committed by accident
* Merge pull request #15306 from rails/4-2-release_notesZachary Scott2014-06-132-0/+249
|\ | | | | Rails 4.2 release notes [ci skip]
| * First pass at Rails 4.2 release notes [ci skip]Godfrey Chan2014-06-131-2/+2
| |
| * Create 4.2 release notes guide scaffold [ci skip]Zachary Scott2014-06-132-0/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Point to future 4-2-stable branch for detailed changes. [ci skip] Sync Active Support changelogs with release notes [ci skip] 4.2 Release Notes is a work in progress [ci skip] Assorted fixes for AS release notes [ci skip] * `Hash#deep_transform_keys` has already been backported * Mentioning `ActiveSupport::SafeBuffer#prepend` in the "Deprecations" section would be enough * Fix syntax in `Kernel#concern` example Sync AS release notes with the latest commits [ci skip] Synced 4.2 release notes with commits in railties [ci skip] Sync AP Deprecations and Notable changes from CHANGELOG [ci skip] Removed 4.2 release notes from the index [ci skip] This deprecation was reverted in 489a8f2 [ci skip] Synced Active Record changelogs for 4.2 release notes [ci skip] Synced Active Model changelog with the release notes [ci skip] Added cc26b6b as a 'Removal' item in AP release notes [ci skip] Use 'character' instead of 'symbol' to avoid confusion [ci skip] Edit pass on 4.2 release notes [ci skip] :memo: :lipstick: Use `.xyz` and `#xyz` appropiately [ci skip]
* | Merge pull request #15689 from sgrif/sg-attribute-methodsMatthew Draper2014-06-142-0/+9
|\ \ | | | | | | Ensure we always define attribute methods
| * | Ensure we always define attribute methodsSean Griffin2014-06-132-0/+9
| | |
* | | Merge pull request #15593 from sgrif/sg-attributeRafael Mendonça França2014-06-1316-88/+225
|\ \ \ | |_|/ |/| | Introduce an Attribute object to handle the type casting dance
| * | Introduce an Attribute object to handle the type casting danceSean Griffin2014-06-1316-88/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a lot more that can be moved to these, but this felt like a good place to introduce the object. Plans are: - Remove all knowledge of type casting from the columns, beyond a reference to the cast_type - Move type_cast_for_database to these objects - Potentially make them mutable, introduce a state machine, and have dirty checking handled here as well - Move `attribute`, `decorate_attribute`, and anything else that modifies types to mess with this object, not the columns hash - Introduce a collection object to manage these, reduce allocations, and not require serializing the types
* | | Copy edits from e0f3f1a [ci skip]Zachary Scott2014-06-131-3/+7
| | | | | | | | | | | | | | | - image_tag is an instance method - explain possible results when asset pipeline is used
* | | Copy edits and code font wrap for Active Record [ci skip]Zachary Scott2014-06-132-30/+30
| | |
* | | Document behavior concerns regarding the full Rails stack [ci skip]Zachary Scott2014-06-131-0/+24
| | | | | | | | | | | | Related to a discussion on #15508
* | | Merge pull request #15690 from deeeki/activemodel_model_docArthur Nogueira Neves2014-06-131-3/+3
|\ \ \ | | | | | | | | [ci skip] Clarify ActiveModel::Model docs
| * | | [ci skip] Clarify ActiveModel::Model docsdeeeki2014-06-141-3/+3
| | | | | | | | | | | | | | | | ActiveModel attributes initialized with String return String values
* | | | Builder source code is still available on github [ci skip]Zachary Scott2014-06-131-0/+3
| | | | | | | | | | | | | | | | This was also removed from #15542
* | | | Add links to RDoc back into API documentation guidelines [ci skip]Zachary Scott2014-06-131-1/+7
| | | | | | | | | | | | | | | | These were removed from #15542 unfortunately :(
* | | | Specifically talking about Rake the library [ci skip]Zachary Scott2014-06-131-2/+1
| | | |
* | | | Merge pull request #15682 from tgxworld/controller_test_processRafael Mendonça França2014-06-131-2/+5
|\ \ \ \ | | | | | | | | | | Set flash in test session when necessary.
| * | | | Set flash in test session when necessary.Guo Xiang Tan2014-06-121-2/+5
| | | | | | | | | | | | | | | | | | | | `to_session_value` returns nil when empty.
* | | | | Merge pull request #15683 from larrylv/fix-token-with-empty-valueMatthew Draper2014-06-133-8/+32
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix parsed token value with header `Authorization token=`.
| * | | | Fix parsed token value with header `Authorization token=`.Larry Lv2014-06-133-8/+32
| | | | |
* | | | | Merge pull request #15686 from sgrif/sg-pg-int-arraysRafael Mendonça França2014-06-132-6/+15
|\ \ \ \ \ | |/ / / / |/| | | | PG arrays should type cast user input
| * | | | PG arrays should type cast user inputSean Griffin2014-06-132-6/+15
|/ / / / | | | | | | | | | | | | | | | | | | | | We guarantee that `model.value` does not change after `model.save && model.reload`. This requires type casting user input for non-string types.
* | | | 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`