aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Improve the test case introduced by bd0d47eSean Griffin2014-12-111-19/+10
* Merge pull request #17994 from mfazekas/pluck-bind-values-masterSean Griffin2014-12-112-2/+26
|\
| * Fix ProtocolViolation/bind message supplies for polymorphic + pluck or groupMiklos Fazkeas2014-12-112-2/+26
* | Merge pull request #18000 from caike/masterRafael Mendonça França2014-12-111-1/+3
|\ \
| * | Update guides with info about vendor/assetsCarlos Souza2014-12-111-1/+3
|/ /
* | Merge pull request #17793 from kamipo/fix_undesirable_range_errorSean Griffin2014-12-118-6/+119
|\ \
| * | Fix undesirable RangeError by Type::Integer. Add Type::UnsignedInteger.Ryuta Kamizono2014-12-128-6/+119
* | | Merge pull request #17998 from kamipo/refactor_quoted_dateSean Griffin2014-12-114-25/+13
|\ \ \ | |/ / |/| |
| * | Refactor `quoted_date`Ryuta Kamizono2014-12-114-25/+13
| |/
* / Revert "Merge pull request #17943 from jeremywadsack/doc_cache_importability"Rafael Mendonça França2014-12-111-4/+0
|/
* Merge pull request #17970 from ulissesalmeida/foreign-type-has-many-has-oneRafael Mendonça França2014-12-1010-3/+53
|\
| * Add foreign_type option for polymorphic has_one and has_many.Ulisses Almeida + Kassio Borges2014-12-0810-3/+53
* | Merge pull request #17989 from y-yagi/patch-1Zachary Scott2014-12-091-1/+1
|\ \
| * | [ci skip] fix typo in MessageVerifier#verify docsyuuji.yaginuma2014-12-101-1/+1
|/ /
* | Merge pull request #17987 from andreynering/ar-validation-docZachary Scott2014-12-091-0/+2
|\ \
| * | Adding information about 'allow_nil' option for 'numericality' [ci skip]Andrey Nering2014-12-091-0/+2
* | | Merge pull request #17988 from caike/masterRafael Mendonça França2014-12-091-0/+2
|\ \ \
| * | | Add guides for `required` model generator option.Carlos Souza2014-12-091-0/+2
|/ / /
* | | Merge pull request #17982 from andreynering/testing-documentationRichard Schneeman2014-12-101-0/+2
|\ \ \
| * | | Adding a tip in the guides about possible database permission problems onandrey.nering@gmail.com2014-12-091-0/+2
| |/ /
* | | Merge pull request #17975 from merongivian/add_test_for_search_fieldRafael Mendonça França2014-12-093-11/+15
|\ \ \ | |/ / |/| |
| * | Fix options overwritten by superJose Añasco2014-12-093-11/+15
|/ /
* | Unused csv fixture fileAkira Matsuda2014-12-091-1/+0
* | Merge pull request #17972 from claudiob/remove-unused-callback-fixturesCarlos Antonio da Silva2014-12-091-46/+0
|\ \
| * | Remove unused "Developer" fixtures from testsclaudiob2014-12-081-46/+0
| |/
* | Merge pull request #17977 from yui-knk/fix/typoRafael Mendonça França2014-12-091-1/+1
|\ \
| * | [ci skip] Fix typoyui-knk2014-12-091-1/+1
|/ /
* | Update test case for TZ aware attributesSean Griffin2014-12-081-4/+14
* | Allow custom handling of non-standard types in `time_zone_conversion`Sean Griffin2014-12-082-1/+7
|/
* Don't error when `attributes` is called on a frozen AR modelSean Griffin2014-12-082-1/+11
* Revert to 4.1 behavior for casting PG arraysSean Griffin2014-12-082-5/+23
* Only check that it is a Rails application onceRafael Mendonça França2014-12-081-5/+7
* Merge pull request #17964 from carols10cents/improve-after-commit-argumenterr...Rafael Mendonça França2014-12-082-1/+5
|\
| * Make error message clearer that :on requires a symbol, not a stringCarol Nichols2014-12-072-1/+5
* | Merge pull request #17896 from GBH/globbing_route_mailer_previewRafael Mendonça França2014-12-082-1/+12
|\ \
| * | fixing mailer previews for apps with globbing routeOleg2014-12-032-1/+12
* | | Merge pull request #17969 from tiii/add-brackets-around-attribute_nameRafael Mendonça França2014-12-081-1/+1
|\ \ \
| * | | add brackets around attribute_name_tiii2014-12-081-1/+1
* | | | Fix type case of "validations" and word-wrap from #17954 [ci skip]Zachary Scott2014-12-081-2/+3
* | | | Merge pull request #17966 from mikechau/update-ar-store-validation-documentationZachary Scott2014-12-081-1/+4
|\ \ \ \
| * | | | Add note to Store about uniqueness validation (#17954) [skip ci]Mike Chau2014-12-081-1/+4
| |/ / /
* | | | Merge pull request #17953 from kirs/test-activejob-generatorRafael Mendonça França2014-12-081-0/+29
|\ \ \ \ | |/ / / |/| | |
| * | | Test coverage for ActiveJob generatorKir Shatrov2014-12-071-0/+29
* | | | Merge pull request #17963 from neerajdotname/wordsmitthingRichard Schneeman2014-12-081-3/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | minor sentences fixesNeeraj Singh2014-12-071-3/+3
|/ / /
* | | Merge pull request #17959 from eileencodes/fix-grammar-on-reflectionZachary Scott2014-12-071-3/+3
|\ \ \
| * | | Fix grammar of sentence in Reflection documentationeileencodes2014-12-071-3/+3
|/ / /
* | | Merge pull request #17950 from y-yagi/postgres_guideRichard Schneeman2014-12-071-0/+3
|\ \ \
| * | | [ci skip] add `enable_extension` to PostgreSQL hstore exampleyuuji.yaginuma2014-12-071-0/+3
|/ / /
* | | Merge pull request #17944 from tjschuck/mounted_named_routes_regressionSantiago Pastorino2014-12-062-14/+43
|\ \ \