aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* `QueueAdapters` does the lookupTamir Duberstein2015-03-122-5/+9
|
* Merge pull request #19309 from f1sherman/dont-set-session-options-idGuillermo Iguaran2015-03-125-13/+5
|\ | | | | Use request.session.id instead of request.session_options[:id]
| * Use request.session.id instead of request.session_options[:id]Brian John2015-03-125-13/+5
| | | | | | | | | | | | | | | | | | As of the upgrade to Rack 1.5, request.session_options[:id] is no longer populated. Reflect this change in the tests by using request.session.id instead. Related change in Rack: https://github.com/rack/rack/commit/83a270d6
* | Merge pull request #19310 from square/aj-const-getArthur Nogueira Neves2015-03-121-1/+1
|\ \ | | | | | | Use a more conservative `const_get` over `constantize`
| * | Use a more conservative `const_get` over `constantize`Tamir Duberstein2015-03-121-1/+1
| | |
* | | Merge pull request #19271 from eagletmt/304-content-typeArthur Nogueira Neves2015-03-122-0/+13
|\ \ \ | |/ / |/| | 304 response should not include Content-Type header
| * | Also skip Content-Encoding and Vary header if 304Kohei Suzuki2015-03-122-4/+6
| | |
| * | 304 response should not include Content-Type headerKohei Suzuki2015-03-102-1/+12
| | | | | | | | | | | | | | | Rack::Lint raises an error saying "Content-Type header found in 304 response, not allowed".
* | | Merge pull request #19308 from yui-knk/fix/doc_noteAbdelkader Boudih2015-03-121-1/+4
|\ \ \ | | | | | | | | [ci skip] Take NOTE: as paragraph to make NOTE block
| * | | [ci skip] Take NOTE: as paragraph to make NOTE blockyui-knk2015-03-121-1/+4
|/ / /
* | | Merge pull request #19301 from Empact/default-scopesCarlos Antonio da Silva2015-03-126-19/+20
|\ \ \ | | | | | | | | Isolate access to .default_scopes in ActiveRecord::Scoping::Default
| * | | Isolate access to .default_scopes in ActiveRecord::Scoping::DefaultBen Woosley2015-03-126-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead use .scope_attributes? consistently in ActiveRecord to check whether there are attributes currently associated with the scope. Move the implementation of .scope_attributes? and .scope_attributes to ActiveRecord::Scoping because they don't particularly have to do specifically with Named scopes and their only dependency, in the case of .scope_attributes?, and only caller, in the case of .scope_attributes is contained in Scoping.
* | | | Use `def setup` instead of `setup do`eileencodes2015-03-121-2/+4
| | | | | | | | | | | | | | | | | | | | `setup do` creates unnecessary allocations of proc objects in callbacks. This prevents that from happening and results in faster code.
* | | | Merge pull request #19303 from y-yagi/travel_to_docAbdelkader Boudih2015-03-121-9/+11
|\ \ \ \ | | | | | | | | | | add `DateTime.now` to list of `TimeHelpers#travel_to` stubbing [ci skip]
| * | | | add `DateTime.now` to list of `TimeHelpers#travel_to` stubbing [ci skip]yuuji.yaginuma2015-03-121-9/+11
|/ / / /
* | | | Merge pull request #19299 from mattbrictson/pg-ruby-22Yves Senn2015-03-122-2/+7
|\ \ \ \ | | | | | | | | | | Require pg ~> 0.18 to ensure Ruby 2.2 compatibility
| * | | | Require pg~>0.18 to ensure Ruby 2.2 compatibilityMatt Brictson2015-03-112-2/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Versions of the pg gem earlier than 0.18.0 cannot be used safely with Ruby 2.2. Specifically, pg 0.17 when used with Ruby 2.2 has a known bug that causes random bits to be added to the end of strings. Further explanation here: https://bitbucket.org/ged/ruby-pg/issue/210/crazy-bytes-being-added-to-record
* | | | Merge pull request #16992 from square/configurable-job-queue-adapterJeremy Kemper2015-03-124-17/+82
|\ \ \ \ | |/ / / |/| | | ActiveJob: queue_adapter can be inherited
| * | | `ActiveJob::Base#queue_adapter` is now a `class_attribute`Tamir Duberstein2015-03-114-17/+82
| | | | | | | | | | | | | | | | | | | | | | | | This allows different `queue_adapters` to be used in each `ActiveJob` class heirarchy. Previously, all subclasses used a single global queue adapter.
* | | | Merge pull request #18459 from cantino/action_controller_guide_editsRafael Mendonça França2015-03-111-45/+44
|\ \ \ \ | |/ / / |/| | | Action Controller guide edits for grammar and clarity
| * | | Edits for grammar and clarity, with help from georgeclaghorn and robin850.Andrew Cantino2015-03-111-45/+44
| | | |
* | | | Merge pull request #19295 from square/aj-instancesJeremy Kemper2015-03-1119-153/+174
|\ \ \ \ | | | | | | | | | | `ActiveJob::QueueAdapters::*` are no longer singletons
| * | | | `ActiveJob::QueueAdapters::*` are no longer singletonsTamir Duberstein2015-03-1118-152/+173
| | | | |
| * | | | Fix naming collisionTamir Duberstein2015-03-111-1/+1
| | |_|/ | |/| |
* / | | Revert "Merge pull request #15476 from JacobEvelyn/master"Jeremy Kemper2015-03-112-10/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces undesirable `Rails.logger` formatters (such as the syslog formatter) onto a `Logger.new(STDERR)` for the console. The production logger may be going elsewhere than standard io, so we can't presume to reuse its formatter. With syslog, this causes missing newlines in the console, so irb prompts start at the end of the last log message. We can work to expose the console formatter in another way to address the original issue. This reverts commit 026ce5ddf11c4cda0aae7f33a9266e54117db318, reversing changes made to 6f0a69c5899ebdc892e2aa23e68e2604fa70fb73.
* | | Merge pull request #19289 from ahmad-alkheat/masterYves Senn2015-03-111-1/+1
|\ \ \ | | | | | | | | Unnecessary usage of self in the guides [ci skip]
| * | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 15:18:09 +0000