aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Escapes and edits to configuring guide [ci skip] (#28280)Vipul A M2017-03-041-5/+5
* | | | | A private method can't be called with `self.`Akira Matsuda2017-03-041-2/+2
* | | | | Merge pull request #28265 from 0oneo/association_guideRyuta Kamizono2017-03-041-1/+1
|\ \ \ \ \
| * | | | | passing unique parameter to belongs_to wrongly0oneo2017-03-031-1/+1
* | | | | | Merge pull request #28276 from rails/pkwipAaron Patterson2017-03-033-46/+78
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | remove unused parametersAaron Patterson2017-03-031-6/+6
| * | | | | `join_keys` no longer needs a class passed to itAaron Patterson2017-03-033-30/+33
| * | | | | refactor so there is only one JoinKeys factory methodAaron Patterson2017-03-031-4/+15
| * | | | | ask reflection for klass join reflectionAaron Patterson2017-03-032-13/+16
| * | | | | Move join scopes on to the reflection objectAaron Patterson2017-03-032-8/+23
* | | | | | Merge pull request #28272 from rails/add-iso8601-and-rfc3339-parsingAndrew White2017-03-038-0/+398
|\ \ \ \ \ \
| * | | | | | Add `rfc3339` aliases to `xmlschema`Andrew White2017-03-035-0/+25
| * | | | | | Add `Time.rfc3339` parsing methodAndrew White2017-03-033-0/+62
| * | | | | | Add `ActiveSupport::TimeZone.rfc3339` parsing methodAndrew White2017-03-033-0/+173
| * | | | | | Add `ActiveSupport::TimeZone.iso8601` parsing methodAndrew White2017-03-033-0/+138
* | | | | | | Merge pull request #28271 from dijonkitchen/patch-2Robin Dupret2017-03-031-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix spellingJonathan Chen2017-03-031-1/+1
|/ / / / / /
* / / / / / Remove unnecessary system test codeeileencodes2017-03-031-13/+0
|/ / / / /
* | | | | Merge pull request #28267 from rails/rm-node-from-constraintsAaron Patterson2017-03-032-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove `node` parameter to `join_constraints`Aaron Patterson2017-03-032-3/+3
|/ / / /
* | | | Fix typo in commentAndrew White2017-03-031-1/+1
* | | | Merge pull request #28223 from mtsmfm/fix-random-fail-on-system-test-with-ajaxEileen M. Uchitelle2017-03-032-1/+29
|\ \ \ \
| * | | | Fix random failure on system test with ajaxFumiaki MATSUSHIMA2017-03-032-1/+29
* | | | | Merge pull request #28204 from rails/deprecate-implicit-coercion-of-durationsAndrew White2017-03-036-8/+149
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Deprecate implicit coercion of `ActiveSupport::Duration`Andrew White2017-03-026-8/+149
* | | | | Merge pull request #28260 from Erol/fix-upgrading-rails-guide-typoArun Agrawal2017-03-031-1/+1
|\ \ \ \ \
| * | | | | Fix typo in Upgrading Ruby on Rails Guide [skip ci]Erol Fornoles2017-03-031-1/+1
|/ / / / /
* | | | | Merge pull request #28255 from acrich/masterRyuta Kamizono2017-03-031-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fixed suspected typo in sample sql queryShay2017-03-021-1/+1
| | |_|/ | |/| |
* | | | [ci skip] Add changelog entry for #28139.Kasper Timm Hansen2017-03-021-0/+16
* | | | Inline CIPHER constant.Kasper Timm Hansen2017-03-021-6/+3
* | | | Move key packing into encryptor.Kasper Timm Hansen2017-03-022-6/+4
* | | | Add back yaml require.Kasper Timm Hansen2017-03-021-0/+1
* | | | Merge pull request #28139 from stouset/update-secrets-to-use-modern-cryptoKasper Timm Hansen2017-03-022-17/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Default Secrets to AES-128-GCM, using ActiveSupport::MessageEncryptorStephen Touset2017-03-012-17/+16
* | | | Merge pull request #28245 from y-yagi/use_blank_instead_of_emptyKasper Timm Hansen2017-03-021-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Convert `ENV["EDITOR"]` to string before checkyuuji.yaginuma2017-03-021-1/+1
* | | | Merge pull request #28242 from rails/add-fractional-support-to-datetime-changeAndrew White2017-03-024-17/+46
|\ \ \ \ | |/ / / |/| | |
| * | | Update `DateTime#change` to support usec and nsecAndrew White2017-03-024-17/+46
* | | | Merge pull request #28220 from kamipo/valid_type_accept_only_supported_typesRafael França2017-03-015-42/+10
|\ \ \ \
| * | | | `valid_type?` should accept only supported typesRyuta Kamizono2017-02-285-42/+10
* | | | | [ci skip] Add changelog entry for encrypted secrets.Kasper Timm Hansen2017-03-011-0/+14
* | | | | Put it to me straight: just say it.Kasper Timm Hansen2017-03-011-3/+3
* | | | | Tell users how to assign a $EDITOR.Kasper Timm Hansen2017-03-012-0/+35
| |/ / / |/| | |
* | | | Merge pull request #28239 from y-yagi/use_appropriate_type_for_test_framework...Kasper Timm Hansen2017-03-011-1/+1
|\ \ \ \
| * | | | Use appropriate type for `test_framework` optionyuuji.yaginuma2017-03-011-1/+1
* | | | | Merge pull request #28237 from lzap/default-cipher-dryKasper Timm Hansen2017-03-011-1/+1
|\ \ \ \ \
| * | | | | Use DEFAULT_CIPHER constant in MessageEncryptorLukas Zapletal2017-03-011-1/+1
|/ / / / /
* | | | | Whitelist adapters that support aliases in `HAVING` clauseAndrew White2017-03-011-1/+1
* | | | | Merge pull request #28230 from y-yagi/HOST_to_be_in_uppercaseRafael França2017-02-281-1/+1
|\ \ \ \ \