aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Unnecessary usage of self in the guidesAhmad Al-kheat2015-03-111-1/+1
| | | | | | | | | | | | | | | | | | I deleted self from the callbacks guides code example because it's unnecessary and this way it's more like the other examples where self was not used.
* | | | | | Merge pull request #19288 from yui-knk/fix/routingAbdelkader Boudih2015-03-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Change to code element
| * | | | | | [ci skip] Change to code elementyui-knk2015-03-111-1/+1
|/ / / / / /
* | | | | | pg, `disable_referential_integrity` only catches AR errors.Yves Senn2015-03-112-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | This change was prompted by 598b841.
* | | | | | fix typo in transaction argument. Closes #19265.Yves Senn2015-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a typo in the `:requires_new` option. This led to `#<ArgumentError: unknown keyword: require_new>` leaving all the triggers in a disabled state.
* | | | | | Merge pull request #19280 from palkan/fix-pg-json-testYves Senn2015-03-111-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Upd pg json_test
| * | | | | | Fix json_testpalkan2015-03-111-0/+1
|/ / / / / /
* | | | | | Use the released gemRafael Mendonça França2015-03-102-10/+2
| | | | | |
* | | | | | Merge pull request #19252 from kaspth/single-escaping-strip-tagsRafael Mendonça França2015-03-106-7/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Let strip_tags leave HTML escaping to Rails.
| * | | | | | Let strip_tags leave HTML escaping to Rails.Kasper Timm Hansen2015-03-106-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents double escaping errors, such as "&amp;" becoming "&amp;amp;".
* | | | | | | Add YAML compatibility for objects from Rails 4.2Sean Griffin2015-03-104-27/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of Ruby 2.2, Psych can handle any object which is marshallable. This was not true on previous versions of Ruby, so our delegator types had to provide their own implementation of `init_with` and `encode_with`. Unfortunately, this doesn't match up with what Psych will do today. Since by the time we hit this layer, the objects will have already been created, I think it makes the most sense to just grab the current type from the class.
* | | | | | | Attempt to provide backwards compatible YAML deserializationSean Griffin2015-03-104-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I should have done this in the first place. We are now serializing an explicit version so we can make more careful changes in the future. This will load Active Record objects which were serialized in Rails 4.1. There will be bugs, as YAML serialization was at least partially broken back then. There will also be edge cases that we might not be able to handle, especially if the type of a column has changed. In addition, we're passing this as `from_database`, since that is required for serialized columns at minimum. All other types were serializing the cast value. At a glance, there should be no types for which this is a problem. Finally, dirty checking information will be lost on records serialized in 4.1, so no columns will be marked as changed.
* | | | | | | Merge pull request #19275 from keepcosmos/remove-autoload-pathRafael Mendonça França2015-03-101-16/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove unnecessary autoload path parameters
| * | | | | | | remove unnecessary path parameterskeepcosmos2015-03-101-16/+16
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #19273 from ↵Arthur Nogueira Neves2015-03-101-5/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Gaurav2728/gaurav-remove_test_after_commit_gem_msg ‘test_after_commit’ gem is not require in Rails 5, remove note from doc ...
| * | | | | | ‘test_after_commit’ gem is not required in Rails 5 remove note from docGaurav Sharam2015-03-101-5/+3
|/ / / / / /
* | | | | | Merge pull request #19270 from AndrewHendrie/masterZachary Scott2015-03-091-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | Changed 'blank space' to 'blank line'
| * | | | | Changed 'blank space' to 'blank line'Andrew Hendrie2015-03-091-1/+1
|/ / / / / | | | | | | | | | | Line 85 stated that fixtures are typically separated by a blank space. I changed the wording to blank line because blank space could be misinterpreted as a non-breaking space character when in reality, each fixture record (in YAML) is separated by a blank line.
* | | | | Fix intermittent test failuresSean Griffin2015-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The table is being modified in tests, without reloading the column information on the appropriate class. This is leading to incorrect column information in many cases. The failures fixed by this commit can be replicated with: ARCONN=postgresql ruby -Itest test/cases/adapters/postgresql/hstore_test.rb --seed 21574
* | | | | Call super last in before_setupeileencodes2015-03-092-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the reasons 4cf3b8a, 303567e, and fa63448 needed to be reverted in 7142059. The revert has been reverted and this fixes the issues caused previously. If we call `super` first we will end up nuking the session settings in the application tests that do `setup do` - so any session login or cookie settings will not be persisted thoughout the test sessions. Calling `super` last prevents `@integration_session` from getting nuked and set to nil if it's already set. Test added to prevent regression of this behavior in the future.
* | | | | Revert "Revert integration test refactoring that caused app test regressions"eileencodes2015-03-092-18/+10
| | | | | | | | | | | | | | | | | | | | This reverts commit 714205988315d2f98aa3e749747c44470e18676b.
* | | | | Merge pull request #19243 from yui-knk/fix/requireRafael Mendonça França2015-03-092-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix place of require 'rails_guides/markdown'
| * | | | | Fix place of require 'rails_guides/markdown'yui-knk2015-03-072-1/+1
| | | | | |
* | | | | | Fix intermittent test failuresSean Griffin2015-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default value of `"pg_arrays"."tags"` is being changed to `[]` in one test, but the column information on the model isn't reset after it's changed back. As such, we think the default value is `[]` when in the database it's actually `nil`. That means any test which was assigning `[]` to a new record would have that key skipped with partial writes, as it hasn't changed from the default. However since the *actual* default value is `nil`, we get back values that the test doesn't expect, and it fails.
* | | | | | Merge pull request #19264 from y-yagi/plugins_guideArthur Nogueira Neves2015-03-091-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | use public Module#include instead of send :include [ci skip]
| * | | | | | use public Module#include instead of send :include [ci skip]yuuji.yaginuma2015-03-091-3/+3
| | | | | | |
* | | | | | | Revert "Take DST into account when locating TimeZone from Numeric."Andrew White2015-03-093-24/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverting this as it's not the implementation that we would like it to be. This is being used inside of ActiveSUpport::TimeZone[] and it's unaware of the context in which to find the timezone period so the timezone found changes depending on whether DST is in effect for the current period. This means that `'2001-01-01'.in_time_zone(-9)` changes from winter/summer even though it's the same date that we're trying to convert. Since finding timezones by numeric offsets is a bit hit and miss we should introduce a new API for finding them which supplies the date context in which we want to search and we should probably also deprecate the finding of timezones via the [] method, though this needs further discussion. This reverts commit 2cc2fa3633edd96773023c6b09d07c7b9d9b841d.
* | | | | | Merge pull request #19263 from splattael/target-2.2.1Yves Senn2015-03-099-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Target Ruby 2.2.1 in gemspecs
| * | | | | | Target Ruby 2.2.1 in gemspecsPeter Suschlik2015-03-099-9/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | This is a follow-up to #19257
* | | | | | Merge pull request #19257 from jvanbaarsen/patch-1Eileen M. Uchitelle2015-03-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rails 5.0 needs ruby 2.2.1 or higher
| * | | | | | Rails 5.0 needs ruby 2.2.1 or higherJeroen van Baarsen2015-03-081-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Since there was a bug in 2.2.0, the minimum ruby requirement is 2.2.1. See https://github.com/rails/rails/commit/8ed0b89b [skip ci]
* | | | | | Merge pull request #18200 from brainopia/rollback_frozen_recordsArthur Nogueira Neves2015-03-072-1/+21
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix rollback of frozen records
| * | | | | Fix transaction state for unsynced records when entering transactionbrainopia2015-03-042-0/+10
| | | | | |
| * | | | | Fix rollback of frozen recordsbrainopia2015-03-042-1/+11
| | | | | |
* | | | | | Merge pull request #19247 from wazery/doc_fixEileen M. Uchitelle2015-03-074-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Doc fixes [ci skip]
| * | | | | | Doc fixes [ci skip]Islam Wazery2015-03-074-4/+4
|/ / / / / /
* | | | | | Merge pull request #19246 from wazery/patch-1Robin Dupret2015-03-071-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Doc fix [ci skip]
| * | | | | | Doc fix [ci skip]Islam Wazery2015-03-071-7/+7
|/ / / / / /
* | | | | | Merge pull request #19242 from y-yagi/integration_test_exampleKasper Timm Hansen2015-03-071-7/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | update integration test example as is not output deprecation warning [ci skip]
| * | | | | update integration test example as is not output deprecation warning [ci skip]yuuji.yaginuma2015-03-071-7/+8
|/ / / / /
* | | | | Merge pull request #19241 from yui-knk/fix/commentRichard Schneeman2015-03-061-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | [ci skip] Fix `AS` and `AR` to full name
| * | | | [ci skip] Fix `AS` and `AR` to full nameyui-knk2015-03-071-2/+2
|/ / / /
* | | | Merge pull request #19234 from sivsushruth/doc_fixKasper Timm Hansen2015-03-071-1/+1
|\ \ \ \ | | | | | | | | | | Doc fix [ci skip]
| * | | | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-071-1/+1
| | | | |
* | | | | Merge pull request #19231 from prathamesh-sonpatki/fix-url-for-documentationGuillermo Iguaran2015-03-061-1/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix documentation of url_for module [ci skip]
| * | | | | Fix documentation of url_for module [ci skip]Prathamesh Sonpatki2015-03-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The request needs to be instance of ActionDispatch::Request or an object that responds to host, optional_port, protocol and symbolized_path_parameter. - This documentation was correctly added in https://github.com/rails/rails/commit/e3b3f416b57f5642ea25078485f7e9394ad04526 but was changed to https://github.com/rails/rails/commit/e1ceae576e3911f3e6708b5d19a0e3ef63769eb7. - Fixes #16160.
* | | | | | Merge pull request #19233 from sivsushruth/doc_fixAbdelkader Boudih2015-03-061-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Doc fix [ci skip]
| * | | | | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-061-1/+1
| | | | | |
* | | | | | Fix leaky `only: …` option for Active Job assertionsJeremy Kemper2015-03-062-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The filter was set on the pseudo-global TestAdapter but not restored to its original value. See e818f65770fe115ab1cc7fbacc0e7e94d92af6a4
* | | | | | Merge pull request #19230 from prathamesh-sonpatki/fix-clear-docRobin Dupret2015-03-061-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updated documentation of CollectionProxy#clear [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 13:15:10 +0000