Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | autoloading guide: some rewordings [ci skip] | Xavier Noria | 2014-12-15 | 1 | -25/+25 |
| | |||||
* | autoloading guide: more refinements [ci skip] | Xavier Noria | 2014-12-15 | 1 | -10/+11 |
| | |||||
* | autoloading guide: more edits [ci skip] | Xavier Noria | 2014-12-15 | 1 | -11/+15 |
| | |||||
* | autoloading guide: documents constant resolution algorithms | Xavier Noria | 2014-12-15 | 1 | -18/+51 |
| | |||||
* | autoloading guide: damn typos [ci skip] | Xavier Noria | 2014-12-15 | 1 | -2/+2 |
| | |||||
* | autoloading guide: documents nesting | Xavier Noria | 2014-12-15 | 1 | -62/+160 |
| | |||||
* | autoloading guide: minor edits. | Yves Senn | 2014-12-15 | 1 | -20/+19 |
| | | | | /cc @fxn | ||||
* | autoloading guide: Kernel#autoload -> Module#autoload [ci skip] | Xavier Noria | 2014-12-15 | 1 | -7/+7 |
| | |||||
* | autoloading guide: new section about why Kernel#autoload is not involved [ci ↵ | Xavier Noria | 2014-12-15 | 1 | -0/+35 |
| | | | | skip] | ||||
* | autoloading guide: relax type of constant names [ci skip] | Xavier Noria | 2014-12-15 | 1 | -4/+4 |
| | |||||
* | autoloading guide, fix typo `Amin` -> `Admin`. [ci skip] | Yves Senn | 2014-12-15 | 1 | -3/+3 |
| | | | | /cc @fxn | ||||
* | Merge pull request #18030 from zzak/doc-timestamps-null-option-from-generator | Yves Senn | 2014-12-15 | 4 | -25/+25 |
|\ | | | | | Add `null` option to timestamps as migration generator does [ci skip] | ||||
| * | Add `null` option to timestamps as migration generator does [ci skip] | Zachary Scott | 2014-12-14 | 4 | -25/+25 |
|/ | |||||
* | Fix path typo to Article model in Getting Started [ci skip] | Zachary Scott | 2014-12-14 | 1 | -1/+1 |
| | |||||
* | Use generic timestamp for generated migration file. [ci skip] | Zachary Scott | 2014-12-14 | 1 | -2/+2 |
| | |||||
* | Rephrase this from 3f38762 [ci skip] | Zachary Scott | 2014-12-14 | 1 | -1/+1 |
| | |||||
* | Edit pass to section 5.1 of getting started guide [ci skip] | Zachary Scott | 2014-12-14 | 1 | -15/+17 |
| | |||||
* | new guide: constant autoloading and reloading | Xavier Noria | 2014-12-15 | 2 | -0/+1075 |
| | |||||
* | Merge pull request #18024 from carpodaster/fix/actionview/capture-non-strings | Santiago Pastorino | 2014-12-14 | 4 | -3/+15 |
|\ | | | | | Re-enable capture'ing non-String values | ||||
| * | Re-enable capture'ing non-String values | Carsten Zimmermann | 2014-12-14 | 4 | -3/+15 |
|/ | | | | | | | This has been discussed in #17661 and partially reverts the changes made in 9de83050d3a4b260d4aeb5d09ec4eb64f913ba64 and 986cac73e3c56b3dfa22fd1464f6913e38d32cc3 The test case added to content_for acts as a regression / acceptance test. | ||||
* | Merge pull request #18022 from agrobbin/url-helpers-optional-scopes | Santiago Pastorino | 2014-12-13 | 3 | -1/+17 |
|\ | | | | | Allow URL helpers to work with optional scopes | ||||
| * | allow URL helpers to work with optional scopes | Alex Robbin | 2014-12-13 | 3 | -1/+17 |
| | | |||||
* | | Merge pull request #18021 from nateberkopec/fix-filter-param-symbol-dup | Santiago Pastorino | 2014-12-13 | 2 | -3/+3 |
|\ \ | |/ |/| | ParameterFilter shouldn't try to dup symbol keys | ||||
| * | ParameterFilter shouldn't try to dup symbol keys | Nate Berkopec | 2014-12-13 | 2 | -3/+3 |
|/ | |||||
* | Merge pull request #18019 from ↵ | Aaron Patterson | 2014-12-13 | 1 | -16/+17 |
|\ | | | | | | | | | eileencodes/pass-connection-rather-than-alias_tracker Pass connection rather than alias_tracker | ||||
| * | Pass connection rather than alias_tracker | eileencodes | 2014-12-13 | 1 | -16/+17 |
| | | | | | | | | | | | | | | | | | | Because we're only using the `connection` so passing the entire tracker isn't unnecessary. Eventually only the `connection` will be passed to `add_constraints` with later refactoring but curretly that's not possible because of `construct_tables` method. | ||||
* | | Merge pull request #18020 from ↵ | Andrew White | 2014-12-13 | 3 | -2/+42 |
|\ \ | |/ |/| | | | | | binaryberry/handle-positional-args-with-format-false Fix handling of positional url helper arguments when format is false | ||||
| * | Fix handling of positional url helper arguments when format is false | Tatiana Soukiassian | 2014-12-13 | 3 | -2/+42 |
|/ | | | | | | | There is no need to subtract one from the path_params size when there is no format parameter because it is not present in the path_params array. Fixes #17819. | ||||
* | Merge pull request #18018 from ↵ | Godfrey Chan | 2014-12-12 | 1 | -1/+1 |
|\ | | | | | | | | | yuki24/fix-method-name-inconsistency-in-mailer-example [guides] Fix method name inconsistency in a mailer example | ||||
| * | [guides] Fix method name inconsistency in a mailer example | Yuki Nishijima | 2014-12-12 | 1 | -1/+1 |
|/ | | | | [ci skip] | ||||
* | redis 3.2.0 doesn't allow tcp protocol anymore | Rafael Mendonça França | 2014-12-13 | 1 | -1/+1 |
| | | | | Use redis protocol | ||||
* | Merge pull request #18006 from sikachu/add-params-to_unsafe_h | Rafael Mendonça França | 2014-12-12 | 2 | -0/+12 |
|\ | | | | | Add AC::Parameters#to_unsafe_h | ||||
| * | Add AC::Parameters#to_unsafe_h | Prem Sichanugrist | 2014-12-12 | 2 | -0/+12 |
| | | | | | | | | | | | | | | | | | | As suggested in #16299([1]), this method should be a new public API for retrieving unfiltered parameters from `ActionController::Parameters` object, given that `Parameters#to_hash` will no longer work in Rails 5.0+ as we stop inheriting `Parameters` from `Hash`. [1]: https://github.com/rails/rails/pull/16299#issuecomment-50220919 | ||||
* | | Mention that Action Mailer methods are not deferred [ci skip] | Godfrey Chan | 2014-12-12 | 1 | -0/+35 |
| | | | | | | | | | | | | Closes #17965, #17968 [Godfrey Chan, Miklós Fazekas] | ||||
* | | Pass through the `prepend` option to `AS::Callback` | Godfrey Chan | 2014-12-12 | 2 | -2/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not sure what's the use case for this, but apparently it broke some apps. Since it was not the intended result from #16210 I fixed it to not raise an exception anymore. However, I didn't add documentation for it because I don't know if this should be officially supported without knowing how it's meant to be used. In general, validations should be side-effect-free (other than adding to the error message to `@errors`). Order-dependent validations seems like a bad idea. Fixes #18002 | ||||
* | | New applications should use sass-rails 5.0 | Rafael Mendonça França | 2014-12-12 | 1 | -6/+1 |
| | | |||||
* | | Rails master requires arel master | Rafael Mendonça França | 2014-12-12 | 1 | -2/+8 |
| | | |||||
* | | Align the GemfileEntry API with stable branches | Godfrey Chan | 2014-12-12 | 1 | -5/+9 |
| | | | | | | | | See 63462ec | ||||
* | | Merge pull request #18003 from sikachu/permit_all_parameters-thread-safety | Rafael Mendonça França | 2014-12-12 | 1 | -1/+10 |
|\ \ | | | | | | | Make AC::Params.permit_all_parameters thread safe | ||||
| * | | Make AC::Params.permit_all_parameters thread safe | Prem Sichanugrist | 2014-12-12 | 1 | -1/+10 |
| |/ | | | | | | | | | | | | | As discussed in #16299[1], this attribute is not thread safe and could potentially create a security issue. [1]: https://github.com/rails/rails/pull/16299#discussion_r15424533 | ||||
* | | Merge pull request #18010 from audionerd/patch-1 | Rafael Mendonça França | 2014-12-12 | 1 | -1/+1 |
|\ \ | | | | | | | Fix default queue name prefix delimiter | ||||
| * | | Fix default queue name prefix delimiter | Eric Skogen | 2014-12-12 | 1 | -1/+1 |
|/ / | | | | | | | | | Now displays as underscore, and not an empty string, when converted from markdown to HTML. Escaped the underscore per http://daringfireball.net/projects/markdown/syntax#em Fixes rails/rails#18009 | ||||
* | | Merge pull request #18007 from georgemillo/patch-1 | Rafael Mendonça França | 2014-12-12 | 1 | -1/+1 |
|\ \ | |/ |/| | English fix [ci skip] | ||||
| * | English fix [ci skip] | George Millo | 2014-12-12 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #17815 from yuki24/remove-custom-errors-page-section | Zachary Scott | 2014-12-11 | 1 | -58/+1 |
|\ | | | | | Remove custom errors page section from the guides [ci skip] | ||||
| * | Remove custom errors page section from the guides | Yuki Nishijima | 2014-11-28 | 1 | -58/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pattern is too problematic and introduces a lot of edge cases: * On 4.2, the issue https://github.com/rails/rails/issues/15124 is back again. * needs to define each action for each http status otherwise the router raises ActionController::RoutingError (No route matches). * If the router has `match "/*username",...` and some action is missing, Rails will pick up the "match" and try to do its job. * encourages people to copy & paste programming. Not DRY. [ci skip] | ||||
* | | Add test case for joined pluck | Sean Griffin | 2014-12-11 | 1 | -0/+7 |
| | | | | | | | | https://github.com/rails/rails/commit/39542fba54328ca048fb75a5d5b37f8e1d4c1f37#commitcomment-8938379 | ||||
* | | Improve the test case introduced by bd0d47e | Sean Griffin | 2014-12-11 | 1 | -19/+10 |
| | | |||||
* | | Merge pull request #17994 from mfazekas/pluck-bind-values-master | Sean Griffin | 2014-12-11 | 2 | -2/+26 |
|\ \ | | | | | | | Fix ProtocolViolation/bind message for polymorphic + pluck or group+calc | ||||
| * | | Fix ProtocolViolation/bind message supplies for polymorphic + pluck or group | Miklos Fazkeas | 2014-12-11 | 2 | -2/+26 |
| | | |