aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Edit pass to section 5.1 of getting started guide [ci skip]Zachary Scott2014-12-141-15/+17
* new guide: constant autoloading and reloadingXavier Noria2014-12-152-0/+1075
* Merge pull request #18024 from carpodaster/fix/actionview/capture-non-stringsSantiago Pastorino2014-12-144-3/+15
|\
| * Re-enable capture'ing non-String valuesCarsten Zimmermann2014-12-144-3/+15
|/
* Merge pull request #18022 from agrobbin/url-helpers-optional-scopesSantiago Pastorino2014-12-133-1/+17
|\
| * allow URL helpers to work with optional scopesAlex Robbin2014-12-133-1/+17
* | Merge pull request #18021 from nateberkopec/fix-filter-param-symbol-dupSantiago Pastorino2014-12-132-3/+3
|\ \ | |/ |/|
| * ParameterFilter shouldn't try to dup symbol keysNate Berkopec2014-12-132-3/+3
|/
* Merge pull request #18019 from eileencodes/pass-connection-rather-than-alias_...Aaron Patterson2014-12-131-16/+17
|\
| * Pass connection rather than alias_trackereileencodes2014-12-131-16/+17
* | Merge pull request #18020 from binaryberry/handle-positional-args-with-format...Andrew White2014-12-133-2/+42
|\ \ | |/ |/|
| * Fix handling of positional url helper arguments when format is falseTatiana Soukiassian2014-12-133-2/+42
|/
* Merge pull request #18018 from yuki24/fix-method-name-inconsistency-in-mailer...Godfrey Chan2014-12-121-1/+1
|\
| * [guides] Fix method name inconsistency in a mailer exampleYuki Nishijima2014-12-121-1/+1
|/
* redis 3.2.0 doesn't allow tcp protocol anymoreRafael Mendonça França2014-12-131-1/+1
* Merge pull request #18006 from sikachu/add-params-to_unsafe_hRafael Mendonça França2014-12-122-0/+12
|\
| * Add AC::Parameters#to_unsafe_hPrem Sichanugrist2014-12-122-0/+12
* | Mention that Action Mailer methods are not deferred [ci skip]Godfrey Chan2014-12-121-0/+35
* | 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
|\ \ \ \