aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix that unsigned with zerofill is treated as signedRyuta Kamizono2016-11-274-2/+9
| | | | Fixes #27125.
* Merge pull request #26865 from ↵Matthew Draper2016-11-273-4/+23
|\ | | | | | | | | sergey-alekseev/uniqueness-validation-scope-with-polymorphic-association fix the uniqueness validation scope with a polymorphic association
| * fix the uniqueness validation scope with a polymorphic associationSergey Alekseev2016-11-263-4/+23
| | | | | | | | https://gist.github.com/sergey-alekseev/946657ebdb5e58d1bee115714056ec96
* | abort_on_exception can't be disabled for a single threadMatthew Draper2016-11-272-6/+8
| | | | | | | | | | If it's enabled globally, it's on regardless of how individual threads are set.
* | Only start rabbitmq when we need itMatthew Draper2016-11-271-6/+19
| |
* | We expect exceptions; abort will just raise in the wrong placeMatthew Draper2016-11-272-9/+17
| |
* | Clear available connections immediatelyMatthew Draper2016-11-271-0/+2
| | | | | | | | | | | | | | | | | | | | It'll be re-cleared when it's rebuilt in with_new_connections_blocked's ensure, but we still need to clear it inside this synchronize -- we've disconnected connections that may be available in the queue, and while other threads are not allowed to make *new* connections, they are still allowed to take existing ones from there. This was incorrectly removed in d314646c965b045724e6bdb9d61dcecfabc0ba8f.
* | Merge pull request #27183 from maclover7/jm-av-releaseGuillermo Iguaran2016-11-261-5/+7
|\ \ | |/ |/| Update RELEASING_RAILS.md for rails-ujs
| * Update RELEASING_RAILS.md for rails-ujsJon Moss2016-11-261-5/+7
|/ | | | [ci skip]
* Merge pull request #27182 from maclover7/jm-actionview-buildGuillermo Iguaran2016-11-261-1/+9
|\ | | | | Add asset compilation Rake task for UJS
| * Add asset compilation Rake task for UJSJon Moss2016-11-261-1/+9
|/ | | | | Uses same build pipeline (Blade) as Action Cable. Will run when Rails gems are being built for release.
* Add UJS testsGuillermo Iguaran2016-11-2622-0/+5280
|
* Add rails-ujs to Action ViewGuillermo Iguaran2016-11-2614-0/+649
|
* Convert ActionView::Railtie into EngineGuillermo Iguaran2016-11-261-1/+1
|
* Make the test that seems to be getting stuck noisierMatthew Draper2016-11-261-35/+55
| | | | | I assume it's upset because of the change in d314646c965b045724e6bdb9d61dcecfabc0ba8f, but I don't yet understand why.
* Merge pull request #27179 from y-yagi/follow_up_to_8e1714bMatthew Draper2016-11-261-1/+1
|\ | | | | use correct variable in BacktraceCleaner test
| * use correct variable in BacktraceCleaner testyuuji.yaginuma2016-11-261-1/+1
|/ | | | `@target_dir` variable was changed to local variable in 8e1714b.
* We're not calling hooks here since 9e4c41c903e8e58721f2c41776a8c60ddba7a0a9Akira Matsuda2016-11-251-1/+0
|
* Merge pull request #27140 from ↵Rafael França2016-11-253-2/+20
|\ | | | | | | | | supercaracal/fix-force-ssl-if-session-store-disabled Fix a force ssl redirection bug that occur when session store disabled.
| * Remove aggressive unit test with mock. And add integration level test.Taishi Kasuga2016-11-243-25/+19
| |
| * Fix a force ssl redirection bug that occur when session store disabled.Taishi Kasuga2016-11-222-1/+25
| |
* | Merge pull request #23675 from kachick/activemodel-errors-indifferentRafael França2016-11-253-5/+19
|\ \ | | | | | | Adjust to indifferent access around some ActiveModel::Errors methods
| * | Allow indifferent access in ActiveModel::ErrorsKenichi Kamiya2016-11-223-5/+19
| | | | | | | | | | | | | | | | | | `#[]` has already applied indifferent access, but some methods does not. `#include?`, `#has_key?`, `#key?`, `#delete` and `#full_messages_for`.
* | | Merge pull request #27165 from ↵Rafael França2016-11-252-6/+16
|\ \ \ | | | | | | | | | | | | | | | | prathamesh-sonpatki/followup-uuid-extension-change Followup of UUID default extension in the docs
| * | | Followup of UUID default extension in the docs [ci skip]Prathamesh Sonpatki2016-11-242-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Mentioned clearly that for PostgreSQL < 9.4, you need to pass the default option with "uuid_generate_v4()" - Also updated PostgreSQL Active Record guide with this change. - https://github.com/rails/rails/pull/25395#r66877078
* | | | Merge pull request #26874 from tgxworld/fix_broadcast_loggerMatthew Draper2016-11-252-5/+21
|\ \ \ \ | | | | | | | | | | `Broadcast#silence` breaks custom loggers that do not include `Logg…
| * | | | `Broadcast#silence` breaks custom loggers that does not include `LoggerSilence`.Guo Xiang Tan2016-10-242-5/+21
| | | | |
* | | | | Merge pull request #27174 from kamipo/fix_require_dependency_message_formatMatthew Draper2016-11-252-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix `require_dependency` message format
| * | | | | Fix `require_dependency` message formatRyuta Kamizono2016-11-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `depend_on` message format is `"No such file to load -- %s.rb"`. But `require_dependency` message is missing `.rb` suffix. ``` % git grep -n 'No such file to load' actionview/test/actionpack/abstract/helper_test.rb:112: assert_equal "No such file to load -- very_invalid_file_name.rb", e.message activesupport/lib/active_support/dependencies.rb:245: def require_dependency(file_name, message = "No such file to load -- %s.rb") activesupport/lib/active_support/dependencies.rb:333: def depend_on(file_name, message = "No such file to load -- %s.rb") ```
* | | | | | Merge pull request #27173 from kamipo/fix_warning_method_redefinedMatthew Draper2016-11-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix warning: method redefined; discarding old fields
| * | | | | | Fix warning: method redefined; discarding old fieldsRyuta Kamizono2016-11-251-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Follow up to #26976.
* | | | | | Merge pull request #27172 from kamipo/should_test_change_column_defaultMatthew Draper2016-11-251-13/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Should test `test_change_column_default` in `PostgresqlUUIDTest`
| * | | | | Should test `test_change_column_default` in `PostgresqlUUIDTest`Ryuta Kamizono2016-11-251-13/+13
|/ / / / / | | | | | | | | | | | | | | | Follow up to #25395.
* | | | | Merge pull request #27171 from kamipo/suppress_migration_messageMatthew Draper2016-11-251-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Suppress migration message in the test
| * | | | | Suppress migration message in the testRyuta Kamizono2016-11-251-0/+4
| | | | | |
* | | | | | Merge pull request #27170 from kamipo/remove_blank_else_blockMatthew Draper2016-11-251-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove blank else block
| * | | | | Remove blank else blockRyuta Kamizono2016-11-251-1/+0
|/ / / / /
* | | | | Merge pull request #27108 from matthewd/allocate-connections-after-blockingMatthew Draper2016-11-252-25/+17
|\ \ \ \ \ | | | | | | | | | | | | Distribute connections to previously blocked threads when we're done
| * | | | | Distribute connections to previously blocked threads when we're doneMatthew Draper2016-11-252-25/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two methods block new connections; we were already doing the right thing for clear_reloadable_connections, but it's better placed in with_new_connections_blocked, where it can work for disconnect too.
* | | | | | Merge pull request #26718 from domcleal/5-0-stable-ids-writer-exceptionMatthew Draper2016-11-255-8/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | Restore RecordNotFound when *_ids= can't find records by ID
| * | | | | | Add test for collection *_ids= setter when association primary key setDominic Cleal2016-11-244-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes casting of IDs to the data type of the association primary key, rather than then the data type of the model's primary key. (Tests use a string primary key on the association, rather than an int.) Tests issue #20995
| * | | | | | Restore RecordNotFound when *_ids= can't find records by IDDominic Cleal2016-11-244-7/+17
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c9fb19 changed the behaviour of the _ids= setters for associations to raise an AssociationTypeMismatch when unknown IDs are given: Class: <ActiveRecord::AssociationTypeMismatch> Message: <"Developer(#43811860) expected, got NilClass(#16732720)"> This restores the original ActiveRecord::RecordNotFound exception with a much clearer error message: Class: <ActiveRecord::RecordNotFound> Message: <"Couldn't find all Developers with 'id': (1, -9999) [WHERE \"contracts\".\"company_id\" = ?] (found 1 results, but was looking for 2)"> Fixes #25719
* | | | | | Merge pull request #27166 from mtsmfm/rename-minitestKasper Timm Hansen2016-11-241-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ci skip] `MiniTest` -> `Minitest`
| * | | | | [ci skip] `MiniTest` -> `Minitest`Fumiaki MATSUSHIMA2016-11-241-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | MiniTest was renamed to Minitest. Already renamed on https://github.com/rails/rails/pull/13366 But slipped into on https://github.com/rails/rails/pull/18413/files#diff-6bb90a693835b0e92910b796c8b0ef59R27
* | | | | Merge pull request #25395 from ↵Rafael França2016-11-246-22/+86
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | yawboakye/use_gen_random_uuid_from_pgcrypto_extension For PostgreSQL >= 9.4 use `gen_random_uuid()`
| * | | | | For `PostgreSQL >= 9.4` use `gen_random_uuid()`Yaw Boakye2016-11-226-22/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 9.4, PostgreSQL recommends using `pgcrypto`'s `gen_random_uuid()` to generate version 4 UUIDs instead of the functions in the `uuid-ossp` extension. These changes uses the appropriate UUID function depending on the underlying PostgreSQL server's version, while maintaining `uuid_generate_v4()` in older migrations.
* | | | | | [ci skip] Add changelog entry for 86754a8fKasper Timm Hansen2016-11-231-0/+11
| | | | | |
* | | | | | [ci skip] Explain only :json is shipped by default.Kasper Timm Hansen2016-11-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't want to add defensive programming to this fairly simple thing. Fixes #27060.
* | | | | | Use accept header instead of mangling request path.Kasper Timm Hansen2016-11-233-24/+44
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of appending a format to the request, it's much better to just pass a more appropriate accept header. Rails will figure out the format from that instead. This allows devs to use `:as` on routes that don't have a format. Introduce an `IdentityEncoder` to avoid `if request_encoder`, essentially a better version of the purpose of the `WWWFormEncoder`. One that makes conceptual sense on GET requests too. Fixes #27144.
* | | | | Merge pull request #27113 from rails/remove-jqueryGuillermo Iguaran2016-11-228-18/+34
|\ \ \ \ \ | | | | | | | | | | | | Drop jQuery as a dependency