aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use `@existing_user` while updating existing user, fixing - #ee4e86Akshay Vishnoi2014-06-141-6/+6
|
* Merge pull request #15710 from zuhao/refactor_actionview_digestor_testMatthew Draper2014-06-141-0/+1
|\ | | | | Make sure restoration always happen.
| * Make sure restoration always happen.Zuhao Wan2014-06-141-0/+1
|/
* Cleaned up the `has_secure_password` test casesGodfrey Chan2014-06-141-33/+29
| | | | | | * Grouped the valid test cases in one place * Make the length of the generated password obvious * Removed two wrong (copy-and-pasted) test cases
* Added changelog for #15708 [ci skip]Godfrey Chan2014-06-141-0/+7
|
* Merge pull request #15708 from akshay-vishnoi/secure_passwordGodfrey Chan2014-06-142-0/+34
|\ | | | | SecurePassword - Validate password must be less than or equal to 72
| * SecurePassword - Validate password must be less than or equal to 72Akshay Vishnoi2014-06-142-0/+34
|/ | | | See #14591, Reason - BCrypt hash function can handle maximum 72 characters.
* Parsing DATABASE_URI, use URI#hostname: it's smarter about IPv6Matthew Draper2014-06-143-1/+20
| | | | Fixes #15705.
* Merge pull request #15702 from sgrif/sg-rm-serializedRafael Mendonça França2014-06-134-14/+2
|\ | | | | Remove `serialized?` from the type interface
| * Remove `serialized?` from the type interfaceSean Griffin2014-06-134-14/+2
| |
* | Merge pull request #15660 from larrylv/fix-mount-at-root-pathRafael Mendonça França2014-06-133-0/+14
|\ \ | | | | | | Fix request's path_info when a rack app mounted at '/'.
| * | Fix request's path_info when a rack app mounted at '/'.Larry Lv2014-06-143-0/+14
| |/ | | | | | | Fixes issue #15511.
* | Merge pull request #15701 from zzak/issue_15496Rafael Mendonça França2014-06-131-1/+5
|\ \ | | | | | | Open extension point for defining options in build_through_record
| * | Open extension point for defining options in build_through_recordZachary Scott2014-06-131-1/+5
| | | | | | | | | | | | This fixes #15496
* | | Merge pull request #15694 from sgrif/sg-method-missingRafael Mendonça França2014-06-131-34/+1
|\ \ \ | | | | | | | | Remove unused `method_missing` definition
| * | | Remove unused `method_missing` definitionSean Griffin2014-06-131-34/+1
| | | | | | | | | | | | | | | | We always define attribute methods in the constructor or in `init_with`.
* | | | Merge pull request #15679 from akshay-vishnoi/test-casesRafael Mendonça França2014-06-131-1/+19
|\ \ \ \ | | | | | | | | | | Add missing test cases for #assert_no_difference
| * | | | Add missing test cases for #assert_no_differenceAkshay Vishnoi2014-06-131-1/+19
| | | | |
* | | | | Merge pull request #15343 from dontfidget/fix_polymorphic_automatic_inverse_ofRafael Mendonça França2014-06-135-1/+16
|\ \ \ \ \ | | | | | | | | | | | | prevent bad automatic inverse_of association
| * | | | | use name specified by 'as' for automatic inverse association to avoid ↵Andrew S. Brown2014-06-105-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | reflecting on wrong association
* | | | | | Merge pull request #15693 from pdg137/enforce_utf8Matthew Draper2014-06-143-7/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | In actionview, eliminate calls to tag that use html_safe parameter values.
| * | | | | In actionview, eliminate calls to tag that use html_safe parameter values. ↵Paul Grayson2014-06-133-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | This is generally unnecessary, since tag handles string quoting, except in one case (utf8_enforcer_tag) where we want to specify the encoding ourselves.
* | | | | | Merge pull request #15579 from sgrif/sg-through-associationsRafael Mendonça França2014-06-135-7/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | Through associations should set both parent ids on join models
| * | | | | | Through associations should set both parent ids on join modelsSean Griffin2014-06-135-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | member = Member.new(club: Club.new) member.save! Before: member.current_membership.club_id # => nil After: member.current_membership.club_id # => club's id
* | | | | | | Merge pull request #15692 from sromano/falseClassMatthew Draper2014-06-143-2/+29
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | ActionController::Parameters#require now accepts FalseClass values
| * | | | | | ActionController::Parameters#require now accepts FalseClass valuesSergio Romano2014-06-133-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #15685.
* | | | | | | Merge pull request #15674 from sgrif/sg-mutable-attributesMatthew Draper2014-06-1412-36/+149
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Detect in-place changes on mutable AR attributes
| * | | | | | | Detect in-place changes on mutable AR attributesSean Griffin2014-06-1312-36/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have several mutable types on Active Record now. (Serialized, JSON, HStore). We need to be able to detect if these have been modified in place.
* | | | | | | | Merge pull request #15695 from sgrif/sg-rm-column-types-overrideRafael Mendonça França2014-06-132-11/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Remove unused column types override
| * | | | | | | Remove unused column types overrideSean Griffin2014-06-132-11/+2
| | | | | | | |
* | | | | | | | Merge pull request #15696 from sgrif/sg-bad-testRafael Mendonça França2014-06-131-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Reorder test which does not represent real world usage
| * | | | | | | Reorder test which does not represent real world usageSean Griffin2014-06-131-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't generally modify our classes at runtime like this. Let's create the instance after the class is created. Original commit doesn't imply that this was intentional behavior.
* | | | | | | s/variable supplied/value supplied [ci skip]Zachary Scott2014-06-131-2/+1
| | | | | | |
* | | | | | | 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
| |_|_|_|/ / / |/| | | | | |