aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Pass through the `prepend` option to `AS::Callback`Godfrey Chan2014-12-122-2/+38
* New applications should use sass-rails 5.0Rafael Mendonça França2014-12-121-6/+1
* Rails master requires arel masterRafael Mendonça França2014-12-121-2/+8
* Align the GemfileEntry API with stable branchesGodfrey Chan2014-12-121-5/+9
* Merge pull request #18003 from sikachu/permit_all_parameters-thread-safetyRafael Mendonça França2014-12-121-1/+10
|\
| * Make AC::Params.permit_all_parameters thread safePrem Sichanugrist2014-12-121-1/+10
* | Merge pull request #18010 from audionerd/patch-1Rafael Mendonça França2014-12-121-1/+1
|\ \
| * | Fix default queue name prefix delimiterEric Skogen2014-12-121-1/+1
|/ /
* | Merge pull request #18007 from georgemillo/patch-1Rafael Mendonça França2014-12-121-1/+1
|\ \ | |/ |/|
| * English fix [ci skip]George Millo2014-12-121-1/+1
|/
* Merge pull request #17815 from yuki24/remove-custom-errors-page-sectionZachary Scott2014-12-111-58/+1
|\
| * Remove custom errors page section from the guidesYuki Nishijima2014-11-281-58/+1
* | Add test case for joined pluckSean Griffin2014-12-111-0/+7
* | 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
|\ \ \ \