aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Clean up I18n stored translations after test.Zuhao Wan2014-06-143-4/+12
* Make sure restoration always happen.Zuhao Wan2014-06-141-0/+1
* Cleaned up the `has_secure_password` test casesGodfrey Chan2014-06-141-33/+29
* 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 72Akshay Vishnoi2014-06-142-0/+34
|/
* Parsing DATABASE_URI, use URI#hostname: it's smarter about IPv6Matthew Draper2014-06-143-1/+20
* Merge pull request #15702 from sgrif/sg-rm-serializedRafael Mendonça França2014-06-134-14/+2
|\
| * 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 '/'.Larry Lv2014-06-143-0/+14
| |/
* | 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_recordZachary Scott2014-06-131-1/+5
* | | Merge pull request #15694 from sgrif/sg-method-missingRafael Mendonça França2014-06-131-34/+1
|\ \ \
| * | | Remove unused `method_missing` definitionSean Griffin2014-06-131-34/+1
* | | | Merge pull request #15679 from akshay-vishnoi/test-casesRafael Mendonça França2014-06-131-1/+19
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | use name specified by 'as' for automatic inverse association to avoid reflect...Andrew S. Brown2014-06-105-1/+16
* | | | | | 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. Th...Paul Grayson2014-06-133-8/+7
* | | | | | 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 modelsSean Griffin2014-06-135-7/+47
* | | | | | | Merge pull request #15692 from sromano/falseClassMatthew Draper2014-06-143-2/+29
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | ActionController::Parameters#require now accepts FalseClass valuesSergio Romano2014-06-133-1/+24
* | | | | | | Merge pull request #15674 from sgrif/sg-mutable-attributesMatthew Draper2014-06-1412-36/+149
|\ \ \ \ \ \ \
| * | | | | | | Detect in-place changes on mutable AR attributesSean Griffin2014-06-1312-36/+149
* | | | | | | | Merge pull request #15695 from sgrif/sg-rm-column-types-overrideRafael Mendonça França2014-06-132-11/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | 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 usageSean Griffin2014-06-131-2/+2
| |/ / / / / /
* | | | | | | 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
* | | | | | | Revert code changes at "Copy edits and code font wrap for Active Record [ci s...Rafael Mendonça França2014-06-131-1/+7
* | | | | | | Merge pull request #15306 from rails/4-2-release_notesZachary Scott2014-06-132-0/+249
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
* | | | | | | Merge pull request #15689 from sgrif/sg-attribute-methodsMatthew Draper2014-06-142-0/+9
|\ \ \ \ \ \ \
| * | | | | | | 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 danceSean Griffin2014-06-1316-88/+225
* | | | | | | | Copy edits from e0f3f1a [ci skip]Zachary Scott2014-06-131-3/+7
* | | | | | | | 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
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #15690 from deeeki/activemodel_model_docArthur Nogueira Neves2014-06-131-3/+3
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Clarify ActiveModel::Model docsdeeeki2014-06-141-3/+3
* | | | | | | | Builder source code is still available on github [ci skip]Zachary Scott2014-06-131-0/+3
* | | | | | | | Add links to RDoc back into API documentation guidelines [ci skip]Zachary Scott2014-06-131-1/+7
* | | | | | | | 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
|\ \ \ \ \ \ \