Commit Graph

44787 Commits

Author SHA1 Message Date
Eileen M. Uchitelle
b31a576a5e Merge pull request #15724 from akshay-vishnoi/secure_password_docs
[ci skip] Update #has_secure_password docs
2014-06-14 10:18:02 -04:00
Akshay Vishnoi
fb48fccc25 [ci skip] Update #has_secure_password docs 2014-06-14 19:18:24 +05:30
Godfrey Chan
34221cdcab Merge pull request #15717 from akshay-vishnoi/test-cases
Use `@existing_user` while updating existing user, fixing - ee4e86
2014-06-14 02:41:49 -07:00
Yves Senn
eb87074e0b pg guide, use the term database views to be specific. [ci skip] 2014-06-14 11:20:58 +02:00
Akshay Vishnoi
9bc91260ac Use @existing_user while updating existing user, fixing - #ee4e86 2014-06-14 14:42:52 +05:30
Yves Senn
534e1e1f53 Merge pull request #15712 from zuhao/refactor_actionview_javascript_helper_test
Avoid hard-coded value in test setup and teardown.
2014-06-14 11:09:33 +02:00
Zuhao Wan
0da1c80a99 Avoid hard-coded value in test setup and teardown. 2014-06-14 16:12:44 +08:00
Matthew Draper
a041107bf5 Merge pull request #15710 from zuhao/refactor_actionview_digestor_test
Make sure restoration always happen.
2014-06-14 17:29:04 +09:30
Zuhao Wan
0c58eb02ef Make sure restoration always happen. 2014-06-14 15:55:52 +08:00
Godfrey Chan
ee4e86fa4b Cleaned up the has_secure_password test cases
* Grouped the valid test cases in one place
* Make the length of the generated password obvious
* Removed two wrong (copy-and-pasted) test cases
2014-06-14 00:43:47 -07:00
Godfrey Chan
c416bb8729 Added changelog for #15708 [ci skip] 2014-06-14 00:32:31 -07:00
Godfrey Chan
6fa7726f07 Merge pull request #15708 from akshay-vishnoi/secure_password
SecurePassword - Validate password must be less than or equal to 72
2014-06-14 00:29:30 -07:00
Akshay Vishnoi
cabbc8f6a5 SecurePassword - Validate password must be less than or equal to 72
See #14591, Reason - BCrypt hash function can handle maximum 72 characters.
2014-06-14 12:35:31 +05:30
Matthew Draper
cf67031546 Parsing DATABASE_URI, use URI#hostname: it's smarter about IPv6
Fixes #15705.
2014-06-14 15:09:37 +09:30
Rafael Mendonça França
7244e57de8 Merge pull request #15702 from sgrif/sg-rm-serialized
Remove `serialized?` from the type interface
2014-06-13 20:09:45 -03:00
Sean Griffin
f61d975596 Remove serialized? from the type interface 2014-06-13 17:04:04 -06:00
Rafael Mendonça França
c0ba02281e Merge pull request #15660 from larrylv/fix-mount-at-root-path
Fix request's path_info when a rack app mounted at '/'.
2014-06-13 19:56:01 -03:00
Rafael Mendonça França
9f0cd30d90 Merge pull request #15701 from zzak/issue_15496
Open extension point for defining options in build_through_record
2014-06-13 19:34:20 -03:00
Rafael Mendonça França
2324495d5f Merge pull request #15694 from sgrif/sg-method-missing
Remove unused `method_missing` definition
2014-06-13 19:33:24 -03:00
Zachary Scott
715489965f Open extension point for defining options in build_through_record
This fixes #15496
2014-06-13 15:30:40 -07:00
Rafael Mendonça França
bcb0b99fe9 Merge pull request #15679 from akshay-vishnoi/test-cases
Add missing test cases for #assert_no_difference
2014-06-13 18:40:29 -03:00
Rafael Mendonça França
4c0a1021e5 Merge pull request #15343 from dontfidget/fix_polymorphic_automatic_inverse_of
prevent bad automatic inverse_of association
2014-06-13 18:19:18 -03:00
Matthew Draper
c28e436aae Merge pull request #15693 from pdg137/enforce_utf8
In actionview, eliminate calls to tag that use html_safe parameter values.
2014-06-14 06:33:21 +09:30
Larry Lv
4a9d4c85c3 Fix request's path_info when a rack app mounted at '/'.
Fixes issue #15511.
2014-06-14 04:57:33 +08:00
Rafael Mendonça França
b0f07abbe3 Merge pull request #15579 from sgrif/sg-through-associations
Through associations should set both parent ids on join models
2014-06-13 17:45:51 -03:00
Matthew Draper
497def80b5 Merge pull request #15692 from sromano/falseClass
ActionController::Parameters#require now accepts FalseClass values
2014-06-14 06:14:19 +09:30
Sean Griffin
0a4e3f4a7f Through associations should set both parent ids on join models
member = Member.new(club: Club.new)
member.save!

Before:

member.current_membership.club_id # => nil

After:

member.current_membership.club_id # => club's id
2014-06-13 14:38:34 -06:00
Matthew Draper
49fee3d271 Merge pull request #15674 from sgrif/sg-mutable-attributes
Detect in-place changes on mutable AR attributes
2014-06-14 05:51:13 +09:30
Sean Griffin
4bf8ffc651 Detect in-place changes on mutable AR attributes
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.
2014-06-13 14:07:41 -06:00
Rafael Mendonça França
1dcb8e997e Merge pull request #15695 from sgrif/sg-rm-column-types-override
Remove unused column types override
2014-06-13 17:02:52 -03:00
Sean Griffin
84cf156e24 Remove unused method_missing definition
We always define attribute methods in the constructor or in `init_with`.
2014-06-13 14:01:20 -06:00
Rafael Mendonça França
1e45fbc2d4 Merge pull request #15696 from sgrif/sg-bad-test
Reorder test which does not represent real world usage
2014-06-13 17:00:55 -03:00
Zachary Scott
f5ae87f8d6 s/variable supplied/value supplied [ci skip] 2014-06-13 13:00:13 -07:00
Zachary Scott
0ece596173 Reword PreparedStatementInvalid example, and use values instead of
variables [ci skip]
Thanks to @matthewd for the excellent feedback! ❤️
2014-06-13 12:58:03 -07:00
Paul Grayson
19af434840 In actionview, eliminate calls to tag that use html_safe parameter values. This is generally unnecessary, since tag handles string quoting, except in one case (utf8_enforcer_tag) where we want to specify the encoding ourselves. 2014-06-13 12:55:55 -07:00
Sean Griffin
0c9287dc4e Reorder test which does not represent real world usage
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.
2014-06-13 13:50:24 -06:00
Rafael Mendonça França
41c8cc632a Revert code changes at "Copy edits and code font wrap for Active Record [ci skip]"
This partially reverts commit 1a203d5e07f639332880099fab610b886b1742fc.

Reason: It was committed by accident
2014-06-13 16:47:15 -03:00
Sean Griffin
ea6f28c8a1 Remove unused column types override 2014-06-13 13:34:31 -06:00
Zachary Scott
4e1da5820a Merge pull request #15306 from rails/4-2-release_notes
Rails 4.2 release notes [ci skip]
2014-06-13 12:31:35 -07:00
Godfrey Chan
1ed19fc535 First pass at Rails 4.2 release notes [ci skip] 2014-06-13 12:27:17 -07:00
Matthew Draper
584498a61f Merge pull request #15689 from sgrif/sg-attribute-methods
Ensure we always define attribute methods
2014-06-14 04:46:05 +09:30
Zachary Scott
88421bd7e5 Create 4.2 release notes guide scaffold [ci skip]
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]

📝 💄 Use `.xyz` and `#xyz` appropiately [ci skip]
2014-06-13 12:00:48 -07:00
Rafael Mendonça França
e61e1b30a5 Merge pull request #15593 from sgrif/sg-attribute
Introduce an Attribute object to handle the type casting dance
2014-06-13 15:45:49 -03:00
Zachary Scott
cc255d3424 Copy edits from e0f3f1a [ci skip]
- image_tag is an instance method
- explain possible results when asset pipeline is used
2014-06-13 11:38:02 -07:00
Zachary Scott
1a203d5e07 Copy edits and code font wrap for Active Record [ci skip] 2014-06-13 11:06:05 -07:00
Sergio Romano
540d153531 ActionController::Parameters#require now accepts FalseClass values
Fixes #15685.
2014-06-13 14:42:38 -03:00
Zachary Scott
e0f3f1a565 Document behavior concerns regarding the full Rails stack [ci skip]
Related to a discussion on #15508
2014-06-13 10:40:53 -07:00
Arthur Nogueira Neves
6071d626e5 Merge pull request #15690 from deeeki/activemodel_model_doc
[ci skip] Clarify ActiveModel::Model docs
2014-06-13 12:21:46 -05:00
deeeki
8a1468eef6 [ci skip] Clarify ActiveModel::Model docs
ActiveModel attributes initialized with String return String values
2014-06-14 02:13:50 +09:00
Zachary Scott
1ecc0106ae Builder source code is still available on github [ci skip]
This was also removed from #15542
2014-06-13 10:12:20 -07:00