aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* allow URL helpers to work with optional scopesAlex Robbin2014-12-133-1/+17
|
* 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]
| * 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 guides [ci skip]
| * Remove custom errors page section from the guidesYuki Nishijima2014-11-281-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 pluckSean Griffin2014-12-111-0/+7
| | | | | | | | https://github.com/rails/rails/commit/39542fba54328ca048fb75a5d5b37f8e1d4c1f37#commitcomment-8938379
* | 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 for polymorphic + pluck or group+calc
| * | 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/assets [ci skip]
| * | | Update guides with info about vendor/assetsCarlos Souza2014-12-111-1/+3
|/ / / | | | | | | | | | | | | | | | fixes #17893 [ci skip]
* | | Merge pull request #17793 from kamipo/fix_undesirable_range_errorSean Griffin2014-12-118-6/+119
|\ \ \ | | | | | | | | Fix undesirable RangeError by Type::Integer. Add Type::UnsignedInteger.
| * | | 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`
| * | | Refactor `quoted_date`Ryuta Kamizono2014-12-114-25/+13
| |/ / | | | | | | | | | Move microseconds formatting to `AbstractAdapter`.
* / / Revert "Merge pull request #17943 from jeremywadsack/doc_cache_importability"Rafael Mendonça França2014-12-111-4/+0
|/ / | | | | | | | | | | | | | | This reverts commit b0e7278ddbe483475d7b2e161e65ae18df91b9f8, reversing changes made to 785d04e3109f69d0b9b9f4732179592f0ef04e52. This is not true. It is a bug and we will fix in the latest 4.0.x release.
* | 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.
| * | Add foreign_type option for polymorphic has_one and has_many.Ulisses Almeida + Kassio Borges2014-12-0810-3/+53
| | | | | | | | | | | | | | | | | | | | | To be possible to use a custom column name to save/read the polymorphic associated type in a has_many or has_one polymorphic association, now users can use the option :foreign_type to inform in what column the associated object type will be saved.
* | | Merge pull request #17989 from y-yagi/patch-1Zachary Scott2014-12-091-1/+1
|\ \ \ | | | | | | | | [ci skip] fix typo in MessageVerifier#verify docs
| * | | [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]
| * | | 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
| * | | | Add guides for `required` model generator option.Carlos Souza2014-12-091-0/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | Related to this PR #16062 [ci skip]
* | | | Merge pull request #17982 from andreynering/testing-documentationRichard Schneeman2014-12-101-0/+2
|\ \ \ \ | | | | | | | | | | Testing Guides: adding TIP about database permission problems [ci skip]
| * | | | Adding a tip in the guides about possible database permission problems onandrey.nering@gmail.com2014-12-091-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | loading fixtures to the database. Reference #17542
* | | | Merge pull request #17975 from merongivian/add_test_for_search_fieldRafael Mendonça França2014-12-093-11/+15
|\ \ \ \ | |/ / / |/| | | Fix options overwritten by super
| * | | 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 tests
| * | | Remove unused "Developer" fixtures from testsclaudiob2014-12-081-46/+0
| |/ / | | | | | | | | | | | | The `RecursiveCallbackDeveloper` and `ImmutableMethodDeveloper` classes are not used anymore in tests, and neither is the `@cancelled` variable.
* | | Merge pull request #17977 from yui-knk/fix/typoRafael Mendonça França2014-12-091-1/+1
|\ \ \ | | | | | | | | [ci skip] Fix typo
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 11:29:28 +0000