aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Mounted Rack apps should have default named routes based on app nameT.J. Schuck2014-12-062-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression in 4.2.0 from 4.1.8. https://github.com/rails/rails/pull/17823 fixed a similar regression regarding _explicitly_ named routes for a mounted Rack app, but there was another regression for the default value. With a route like: Rails.application.routes.draw do mount Mountable::Web, at: 'some_route' end The "Prefix" column of rake routes gives the following: - 4.1.8: mountable_web - 4.2.0.beta1-4: [nothing] - 4.2.0.rc1: [nothing] - 4.2.0.rc2: some_route <- regression This fixes the default to go back to being based off the name of the class like the docs specify: https://github.com/rails/rails/blob/785d04e3109f69d0b9b9f4732179592f0ef04e52/actionpack/lib/action_dispatch/routing/mapper.rb#L558-L560 Explicitly named routes still work correctly per https://github.com/rails/rails/pull/17823: Rails.application.routes.draw do mount Mountable::Web, at: 'some_route', as: 'named' end - 4.1.8: named - 4.2.0.beta1-4: [nothing] - 4.2.0.rc1: [nothing] - 4.2.0.rc2: named
* Add `force: true` to tables created in PG testsSean Griffin2014-12-052-2/+2
| | | | | | If the tests are interupted and the teardown block doesn't run, the developer needs to delete these manually in order to be able to run the tests again.
* Correctly respect subtypes for PG arrays and rangesSean Griffin2014-12-053-10/+43
| | | | | | | | | | | | | The type registration was simply looking for the OID, and eagerly fetching/constructing the sub type when it was registered. However, numeric types have additional parameters which are extracted from the actual SQL string of the type during lookup, and can have their behavior change based on the result. We simply need to use the block form of registration, and look up the subtype lazily instead. Fixes #17935
* Merge pull request #17932 from brooksreese/masterRafael Mendonça França2014-12-052-2/+2
|\ | | | | Fix grammar in Rakefile markup [ci skip]
| * Fix sentence structure [ci skip]Brooks Reese2014-12-051-1/+1
| |
| * Fix grammar in Rakefile markup [ci skip]Brooks Reese2014-12-051-1/+1
| |
* | Merge pull request #17934 from rubys/dev_webconsoleRafael Mendonça França2014-12-051-0/+10
|\ \ | | | | | | Use latest web-console when using --dev or --edge
| * | Use latest web-console when using --dev or --edgeSam Ruby2014-12-051-0/+10
|/ / | | | | | | | | | | Fixes: http://intertwingly.net/projects/AWDwR4/checkdepot-215/makedepot.log
* | Merge pull request #17930 from sergey-alekseev/remove-unused-generalized-tableRafael Mendonça França2014-12-052-49/+0
|\ \ | |/ |/| remove unused `#generalized_table` and `#optional_parts`
| * remove unused `#optional_parts`Sergey Alekseev2014-12-051-4/+0
| | | | | | | | | | This method was copied from journey at https://github.com/rails/rails/commit/56fee39c392788314c44a575b3fd66e16a50c8b5#diff-2cfaf53c860732fea8689d6f2002594bR78. `grep -nr 'optional_parts' .`
| * remove unused `#generalized_table`Sergey Alekseev2014-12-051-45/+0
| | | | | | | | This method wass copied from journey at https://github.com/rails/rails/commit/56fee39c392788314c44a575b3fd66e16a50c8b5#diff-d89de8881fc4b9f10cb3e4fc7b2463f3R53. However it looks the method was unused in journey at those point as well.
* | Include missing requireDavid Heinemeier Hansson2014-12-051-0/+1
| |
* | Merge pull request #17817 from aripollak/hide-activejob-argsDavid Heinemeier Hansson2014-12-052-1/+14
|\ \ | |/ |/| GlobalID objects are logged by their URI, not #inspect on the object, to prevent logging private data
| * Inline to_global_id conversionAri Pollak2014-12-041-5/+1
| |
| * Use try instead of checking for GlobalID::IdentificationAri Pollak2014-12-041-5/+1
| |
| * Only filter GIDable objects; remove cosmetic changesAri Pollak2014-12-012-16/+14
| |
| * Hide potentially sensitive ActiveJob params from logsAri Pollak2014-11-282-11/+34
| | | | | | | | * Show GlobalID instead of full object .inspect output
* | Merge pull request #17925 from rebyn/german_typoSantiago Pastorino2014-12-052-3/+3
|\ \ | | | | | | Fix typo in "Hello World" template in German
| * | Typo: Hello = Guten Tag (in German)Tu Hoang2014-12-052-3/+3
|/ /
* | Merge pull request #17919 from mrgilman/stop-supporting-nested-arraysSean Griffin2014-12-044-40/+5
|\ \ | | | | | | Remove deprecated behavior allowing nested arrays as query values
| * | Remove deprecated behavior allowing nested arrays as query valuesMelanie Gilman2014-12-044-40/+5
| | |
* | | Correctly handle multiple attribute method prefix/suffixes which matchSean Griffin2014-12-042-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Active Record defines `attribute_method_suffix :?`. That suffix will match any predicate method when the lookup occurs in Active Model. This will make it incorrectly decide that `id_changed?` should not exist, because it attempts to determine if the attribute `id_changed` is present, rather than `id` with the `_changed?` suffix. Instead, we will look for any correct match.
* | | Merge pull request #17920 from ↵Sean Griffin2014-12-041-1/+1
|\ \ \ | |/ / |/| | | | | | | | calebthompson/dont-rely-on-environment-task-for-schema-load Remove environment dependency for db:schema:load
| * | Remove environment dependency for db:schema:loadCaleb Thompson2014-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of the behavior :environment was giving (that db:schema:load needed) was provided as well with :load_config. This will address an issue introduced in https://github.com/rails/rails/pull/15394. The fact that db:schema:load now drops and creates the database causes the Octopus gem to have [an issue](https://github.com/tchandy/octopus/issues/273) during the drop step for the test database (which wasn't happening in db:schema:load before). The error looks like: ActiveRecord::StatementInvalid: PG::ObjectInUse: ERROR: cannot drop the currently open database : DROP DATABASE IF EXISTS "app_test" Because of the timing, this issue is present in master, 4-2-*, and 4.1.8. A note to forlorn developers who might see this: "Additionally" in a commit message means you should have a separate commit, with a separate justification for changes. Small commits with big messages are your friends.
* | | Merge pull request #17916 from mrgilman/deprecate-class-handlerSean Griffin2014-12-043-4/+17
|\ \ \ | |/ / |/| | Deprecate `Class` handler in `PredicateBuilder`
| * | Deprecate `Class` handler in `PredicateBuilder`Melanie Gilman2014-12-043-4/+17
| | | | | | | | | | | | Users should pass strings to queries instead of classes
* | | Merge pull request #17797 from y-yagi/donot_delete_mailer_layoutsRafael Mendonça França2014-12-043-4/+23
|\ \ \ | | | | | | | | Don't remove mailer layouts files
| * | | Don't remove mailer layouts filesyuuji.yaginuma2014-11-273-4/+23
| | | |
* | | | Merge pull request #17825 from aripollak/fix-activejob-sidekiq-integrationRafael Mendonça França2014-12-041-1/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix Sidekiq ActiveJob integration setup Conflicts: activejob/test/support/integration/adapters/sidekiq.rb
| * | | Fix Sidekiq ActiveJob integration setupAri Pollak2014-11-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | * .connect on a Redis connection wasn't valid * Reset logger after we're done testing for redis connection to avoid "closed stream" error when starting server for real from a fork
* | | | We don't need to call to_sym. Just compare the stringRafael Mendonça França2014-12-041-1/+1
| | | |
* | | | Merge pull request #17792 from rockrep/masterRafael Mendonça França2014-12-042-1/+11
|\ \ \ \ | | | | | | | | | | | | | | | allow 'all' for :domain option in addition to :all
| * | | | allow 'all' for :domain option in addition to :allrockrep2014-11-262-1/+11
| | | | |
* | | | | Merge pull request #17913 from claudiob/add-docs-to-time-with-zoneRafael Mendonça França2014-12-041-2/+23
|\ \ \ \ \ | | | | | | | | | | | | Add documentation to six AS::TimeWithZone methods [ci skip]
| * | | | | Add documentation to six AS::TimeWithZone methodsclaudiob2014-12-041-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #17912 from claudiob/fix-verified-in-changelogRafael Mendonça França2014-12-041-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix MessageVerifier's #verified in CHANGELOG
| * | | | | Fix MessageVerifier's #verified in CHANGELOGclaudiob2014-12-041-4/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] As confirmed by @lleger (the author of `verified`) [in this comment](https://github.com/rails/rails/pull/17727#issuecomment-65488743): > Actually, it no longer returns false explicitly (bc8cc56), so I guess the CHANGELOG isn't totally accurate. It returns nil instead (but the functionality isn't practically different).
* | | | | Copy-edit the MessageVerifier documentation [ci skip]Rafael Mendonça França2014-12-041-7/+6
| | | | |
* | | | | Merge pull request #17910 from sergey-alekseev/remove-useless-await-closeRafael Mendonça França2014-12-041-6/+0
|\ \ \ \ \ | | | | | | | | | | | | remove unused #await_close
| * | | | | remove unused #await_closeSergey Alekseev2014-12-041-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method was added in https://github.com/rails/rails/commit/30d21dfcb7fafe49b3805b8249454485a90097b6#diff-5055d9f16b442adb1d2f0f65903a196bR141. With the method call in https://github.com/rails/rails/commit/30d21dfcb7fafe49b3805b8249454485a90097b6#diff-cc7bb557df2247c0a42bc180fdb6eb05R47. Later one more method call was added in https://github.com/rails/rails/commit/401787db4bc428dce88b04e343a64c6a6c3b681c#diff-cc7bb557df2247c0a42bc180fdb6eb05R183. And both method calls were deleted in https://github.com/rails/rails/commit/3df07d093a1e4207caa63fd2e3b67599211f5800#diff-cc7bb557df2247c0a42bc180fdb6eb05L47 and https://github.com/rails/rails/commit/3df07d093a1e4207caa63fd2e3b67599211f5800#diff-cc7bb557df2247c0a42bc180fdb6eb05L189. Just do `grep -nr 'await_close' .`.
* | | | | | Merge pull request #17905 from claudiob/add-doc-to-message-verifierRafael Mendonça França2014-12-041-4/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add documentation to MessageVerifier
| * | | | | | Add documentation to MessageVerifierclaudiob2014-12-031-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Complements #17727 and closes ee73d9ff8. @lleger How do you feel about this?
* | | | | | | Merge pull request #17906 from kamipo/prevent_symbol_gcRafael Mendonça França2014-12-041-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Prevent Symbol GC
| * | | | | | | Prevent Symbol GCRyuta Kamizono2014-12-041-0/+3
| |/ / / / / /
* | | | | | | Merge pull request #17909 from sergey-alekseev/doc-changeRichard Schneeman2014-12-041-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | remove misleading class [ci skip]
| * | | | | | remove misleading class [ci skip]Sergey Alekseev2014-12-041-1/+1
|/ / / / / /
* | | | | | Merge pull request #17903 from claudiob/remove-rescue-opensslSantiago Pastorino2014-12-043-32/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove "rescue" clause around "require 'openssl'"
| * | | | | | Remove "rescue" clause around "require 'openssl'"claudiob2014-12-033-32/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some `require 'openssl'` statements were surrounded by `rescue` blocks to deal with Ruby versions that did not support `OpenSSL::Digest::SHA1` or `OpenSSL::PKCS5`. [As @jeremy explains](https://github.com/rails/rails/commit/a6a0904fcb12b876469c48b1c885aadafe9188cf#commitcomment-8826666) in the original commit: > If jruby didn't have jruby-openssl gem, the require wouldn't work. Not sure whether either of these are still relevant today. According to the [release notes for JRuby 1.7.13](http://www.jruby.org/2014/06/24/jruby-1-7-13.html): > jruby-openssl 0.9.5 bundled which means the above `rescue` block is not needed anymore. All the Ruby versions supported by the current version of Rails provide those OpenSSL libraries, so Travis CI should also be happy by removing the `rescue` blocks. --- Just to confirm, with JRuby: $ ruby --version #=> jruby 1.7.16.1 (1.9.3p392) 2014-10-28 4e93f31 on Java HotSpot(TM) 64-Bit Server VM 1.8.0_20-b26 +jit [darwin-x86_64] $ irb irb(main):001:0> require 'openssl' #=> true irb(main):002:0> OpenSSL::Digest::SHA1 #=> OpenSSL::Digest::SHA1 irb(main):003:0> OpenSSL::PKCS5 # => OpenSSL::PKCS5 And with Ruby 2.1: $ ruby --version #=> ruby 2.1.2p95 (2014-05-08 revision 45877) [x86_64-darwin13.0] $ irb irb(main):001:0> require 'openssl' #=> true irb(main):002:0> OpenSSL::Digest::SHA1 #=> OpenSSL::Digest::SHA1 irb(main):003:0> OpenSSL::PKCS5 #=> OpenSSL::PKCS5
* | | | | | docs, bring back `ActiveRecord::Core` methods in the API. [ci skip]Yves Senn2014-12-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This `# :nodoc:` had the effect of hiding every method that follows. This meant that the API page for `ActiveRecord::Core` only contained `configurations` and none of the following methods. Furthermore this `# :nodoc:` had no effect on `maintain_test_schema`. Those `mattr_accessor` inside the `included` block are not picked up by rdoc. /cc @zzak
* | | | | | Merge pull request #17901 from isaacseymour/fix-find-each-docsYves Senn2014-12-041-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Correct docs for ActiveRecord batching methods [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 12:01:52 +0000