aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix a typo [ci skip]Abdelkader Boudih2014-12-151-1/+1
|
* fix a typo [ci skip]Vijay Dev2014-12-151-1/+1
|
* autoloading guide: adds nesting rule for Kernel#load [ci skip]Xavier Noria2014-12-151-2/+5
|
* Merge pull request #18026 from hbd225/fix_duplicate_web-console_entriesRafael Mendonça França2014-12-153-10/+22
|\ | | | | Fix Duplicate web-console entries in Gemfile
| * Fix Duplicate web-console entries in GemfileNorimasaAndo2014-12-143-10/+22
| |
* | Merge pull request #18035 from claudiob/minor-typos-in-autoloading-guideRafael Mendonça França2014-12-151-5/+5
|\ \ | | | | | | Fix minor typos in autoloading guide [ci skip]
| * | Fix minor typos in autoloading guideclaudiob2014-12-151-5/+5
| | | | | | | | | | | | [ci skip]
* | | autoloading guide: some rewordings [ci skip]Xavier Noria2014-12-151-25/+25
|/ /
* | autoloading guide: more refinements [ci skip]Xavier Noria2014-12-151-10/+11
| |
* | autoloading guide: more edits [ci skip]Xavier Noria2014-12-151-11/+15
| |
* | autoloading guide: documents constant resolution algorithmsXavier Noria2014-12-151-18/+51
| |
* | autoloading guide: damn typos [ci skip]Xavier Noria2014-12-151-2/+2
| |
* | autoloading guide: documents nestingXavier Noria2014-12-151-62/+160
| |
* | autoloading guide: minor edits.Yves Senn2014-12-151-20/+19
| | | | | | | | /cc @fxn
* | autoloading guide: Kernel#autoload -> Module#autoload [ci skip]Xavier Noria2014-12-151-7/+7
| |
* | autoloading guide: new section about why Kernel#autoload is not involved [ci ↵Xavier Noria2014-12-151-0/+35
| | | | | | | | skip]
* | autoloading guide: relax type of constant names [ci skip]Xavier Noria2014-12-151-4/+4
| |
* | autoloading guide, fix typo `Amin` -> `Admin`. [ci skip]Yves Senn2014-12-151-3/+3
| | | | | | | | /cc @fxn
* | Merge pull request #18030 from zzak/doc-timestamps-null-option-from-generatorYves Senn2014-12-154-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 Scott2014-12-144-25/+25
|/ /
* | Fix path typo to Article model in Getting Started [ci skip]Zachary Scott2014-12-141-1/+1
| |
* | Use generic timestamp for generated migration file. [ci skip]Zachary Scott2014-12-141-2/+2
| |
* | Rephrase this from 3f38762 [ci skip]Zachary Scott2014-12-141-1/+1
| |
* | 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 values
| * Re-enable capture'ing non-String valuesCarsten Zimmermann2014-12-144-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-scopesSantiago Pastorino2014-12-133-1/+17
|\ | | | | Allow URL helpers to work with optional scopes
| * 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 keys
| * ParameterFilter shouldn't try to dup symbol keysNate Berkopec2014-12-132-3/+3
|/
* Merge pull request #18019 from ↵Aaron Patterson2014-12-131-16/+17
|\ | | | | | | | | eileencodes/pass-connection-rather-than-alias_tracker Pass connection rather than alias_tracker
| * Pass connection rather than alias_trackereileencodes2014-12-131-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 White2014-12-133-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 falseTatiana Soukiassian2014-12-133-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 Chan2014-12-121-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 exampleYuki Nishijima2014-12-121-1/+1
|/ | | | [ci skip]
* redis 3.2.0 doesn't allow tcp protocol anymoreRafael Mendonça França2014-12-131-1/+1
| | | | Use redis protocol
* Merge pull request #18006 from sikachu/add-params-to_unsafe_hRafael Mendonça França2014-12-122-0/+12
|\ | | | | Add AC::Parameters#to_unsafe_h
| * Add AC::Parameters#to_unsafe_hPrem Sichanugrist2014-12-122-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 Chan2014-12-121-0/+35
| | | | | | | | | | | | Closes #17965, #17968 [Godfrey Chan, Miklós Fazekas]
* | Pass through the `prepend` option to `AS::Callback`Godfrey Chan2014-12-122-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.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
| | | | | | | | See 63462ec
* | 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 safe
| * | Make AC::Params.permit_all_parameters thread safePrem Sichanugrist2014-12-121-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-1Rafael Mendonça França2014-12-121-1/+1
|\ \ | | | | | | Fix default queue name prefix delimiter
| * | Fix default queue name prefix delimiterEric Skogen2014-12-121-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-1Rafael Mendonça França2014-12-121-1/+1
|\ \ | |/ |/| English fix [ci skip]