aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* reload I18n as we are defining `:ts` localeKuldeep Aggarwal2014-06-151-0/+2
| | | | fix build- see https://travis-ci.org/rails/rails/jobs/27578159#L2913.
* Merge pull request #15734 from aditya-kapoor/correct-linkZachary Scott2014-06-141-1/+1
|\ | | | | [ci-skip] correct wikipedia MVC link
| * [ci-skip] correct wikipedia MVC linkAditya Kapoor2014-06-141-1/+1
| |
* | Edit pass on `has_secure_password` documentation [ci skip]Godfrey Chan2014-06-141-5/+6
|/
* Merge pull request #15704 from sgrif/sg-deprecate-serializedYves Senn2014-06-143-18/+26
|\ | | | | Deprecate `serialized_attributes` without replacement
| * Deprecate `serialized_attributes` without replacementSean Griffin2014-06-143-18/+26
| | | | | | | | | | We've stopped using it internally, in favor of polymorphism. So should you!
* | Merge pull request #15715 from ↵Yves Senn2014-06-143-4/+11
|\ \ | | | | | | | | | | | | | | | zuhao/refactor_actionview_cleanup_I18n_translations Clean up I18n stored translations after test.
| * | Clean up I18n stored translations after test.Zuhao Wan2014-06-143-4/+12
| | |
* | | docs, remove getting started guide sample application. [ci skip]Yves Senn2014-06-1489-1137/+2
| | | | | | | | | | | | | | | | | | | | | | | | This application always gets out of sync and doesn't add much value. Closes #15721 /cc @rafaelfranca
* | | Merge pull request #15724 from akshay-vishnoi/secure_password_docsEileen M. Uchitelle2014-06-141-6/+9
|\ \ \ | |_|/ |/| | [ci skip] Update #has_secure_password docs
| * | [ci skip] Update #has_secure_password docsAkshay Vishnoi2014-06-141-6/+9
|/ /
* | Merge pull request #15717 from akshay-vishnoi/test-casesGodfrey Chan2014-06-141-6/+6
|\ \ | | | | | | Use `@existing_user` while updating existing user, fixing - ee4e86
| * | Use `@existing_user` while updating existing user, fixing - #ee4e86Akshay Vishnoi2014-06-141-6/+6
| | |
* | | pg guide, use the term `database views` to be specific. [ci skip]Yves Senn2014-06-141-3/+3
| | |
* | | Merge pull request #15712 from zuhao/refactor_actionview_javascript_helper_testYves Senn2014-06-141-3/+3
|\ \ \ | |/ / |/| | Avoid hard-coded value in test setup and teardown.
| * | Avoid hard-coded value in test setup and teardown.Zuhao Wan2014-06-141-3/+3
| | |
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 23:01:20 +0000