Rafael Mendonça França
952d0f8bdf
Merge pull request #15745 from mmozuras/remove_unused_separators_param
...
Remove unused param 'separators' from RouteSet#build_path
2014-06-15 16:24:34 -03:00
Mindaugas Mozūras
aaa7b6bf2c
Remove unused param 'separators' from RouteSet#build_path
2014-06-15 22:01:34 +03:00
Yves Senn
3268a04e99
Merge pull request #15741 from sgrif/sg-update-deprecation-message
...
Change the deprecation warning on `serialized_attributes`
2014-06-15 16:48:59 +02:00
Sean Griffin
b069ab66d3
Change the deprecation warning on serialized_attributes
...
to "without replacement"
2014-06-15 08:44:58 -06:00
Yves Senn
f59ed560ac
allow preview interceptors to be registered through config.action_mailer
.
...
This was partially broken because `preview_interceptors=` just assigned the
raw values, whithout going through `register_preview_interceptor`. Now the
Action Mailer railtie takes care of the `preview_interceptors` option.
This commit is a partial revert of:
Revert "Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_base"
This reverts commit a15704d7f35f17d34d0118546799141d6f853656, reversing
changes made to 1bd12a8609d275ad75fcc4b622ca4f5b32dc76be.
/cc @kuldeepaggarwal @y-yagi
2014-06-15 14:17:00 +02:00
Yves Senn
a15704d7f3
Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_base
...
[ci skip] correct doc for `register_preview_interceptor`
2014-06-15 12:50:23 +02:00
Yves Senn
1bd12a8609
Merge pull request #15738 from kuldeepaggarwal/remove-unwanted-code
...
remove unnecessary calling of `I18n.backend.store_translations('empty', {})`
2014-06-15 12:44:10 +02:00
Kuldeep Aggarwal
880721434c
remove unnecessary calling of I18n.backend.store_translations(empty, {})
...
Clean up I18n stored translations after test
continuation with #15714
2014-06-15 08:53:58 +05:30
yuuji.yaginuma
71da4b0c79
[ci skip] correct doc for register_preview_interceptor
2014-06-15 09:31:28 +09:00
Yves Senn
247cc2205d
Merge pull request #15737 from kuldeepaggarwal/fix-build
...
reload I18n as we are defining `:ts` locale in `test_number_to_human_with_custom_translation_scope`
2014-06-14 21:52:13 +02:00
Kuldeep Aggarwal
cffbceeb03
reload I18n as we are defining :ts
locale
...
fix build- see https://travis-ci.org/rails/rails/jobs/27578159#L2913 .
2014-06-15 01:11:13 +05:30
Zachary Scott
fd4bb5af5f
Merge pull request #15735 from aditya-kapoor/update-wiki-md
...
[ci skip] update wiki link for MVC in README
2014-06-14 11:50:14 -07:00
Aditya Kapoor
57fe5fd9b8
[ci skip] update wiki link for MVC
2014-06-15 00:03:01 +05:30
Zachary Scott
2d3cfcc11f
Merge pull request #15734 from aditya-kapoor/correct-link
...
[ci-skip] correct wikipedia MVC link
2014-06-14 11:12:23 -07:00
Godfrey Chan
0ab163d9c6
Edit pass on has_secure_password
documentation [ci skip]
2014-06-14 11:05:39 -07:00
Aditya Kapoor
1505f8b692
[ci-skip] correct wikipedia MVC link
2014-06-14 23:34:08 +05:30
Yves Senn
69807afdd0
Merge pull request #15704 from sgrif/sg-deprecate-serialized
...
Deprecate `serialized_attributes` without replacement
2014-06-14 16:34:58 +02:00
Yves Senn
64220a1de3
Merge pull request #15715 from zuhao/refactor_actionview_cleanup_I18n_translations
...
Clean up I18n stored translations after test.
2014-06-14 16:32:02 +02:00
Yves Senn
5223bad17c
docs, remove getting started guide sample application. [ci skip]
...
This application always gets out of sync and doesn't add much value.
Closes #15721
/cc @rafaelfranca
2014-06-14 16:20:42 +02:00
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
Sean Griffin
2df1540143
Deprecate serialized_attributes
without replacement
...
We've stopped using it internally, in favor of polymorphism. So should
you!
2014-06-14 06:21:28 -06:00
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
48d118573d
Clean up I18n stored translations after test.
2014-06-14 16:36:53 +08: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