aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused `require "thread"` in `test/cases/attribute_methods/read_test.rb`Ryuta Kamizono2016-09-111-1/+0
| | | | `Mutex` was removed at 8eb7561ac6e8f020ec09608532de310c6b0b8dcd.
* Merge pull request #26449 from prathamesh-sonpatki/fixesGuillermo Iguaran2016-09-102-16/+16
|\ | | | | Use :git for specifying dependencies from github with https protocol
| * Use :git for specifying dependencies from github with https protocolPrathamesh Sonpatki2016-09-102-16/+16
| | | | | | | | | | | | - This is required for bundler 1.13.0 because of which lot of specs are failing on Travis CI. - Similar to https://travis-ci.org/rails/rails/jobs/158905576#L559
* | Merge pull request #26450 from y-yagi/fix_broken_testArthur Nogueira Neves2016-09-101-0/+18
|\ \ | | | | | | use correct Gemfile in `bin/setup` test
| * | use correct Gemfile in `bin/setup` testyuuji.yaginuma2016-09-111-0/+18
| |/ | | | | | | | | | | | | Currently, `bin/setup` test uses Gemfile of Rails. But this Gemfile is not a file to be used in Rails application. Add a Gemfile to Rails application that is created for test, it has been modified to use the Gemfile.
* | Merge pull request #26442 from kirs/action-controller-session-options-mutate1Arthur Nogueira Neves2016-09-102-1/+6
|\ \ | | | | | | Do not mutate AC::TestRequest::DEFAULT_OPTIONS
| * | Do not mutate AC::TestRequest::DEFAULT_OPTIONSKir Shatrov2016-09-102-1/+6
| |/
* | Merge pull request #26454 from kamipo/remove_outdated_todo_commentRichard Schneeman2016-09-101-1/+0
|\ \ | |/ |/| Remove outdated "#TODO: Fix for binds." comment [ci skip]
| * Remove outdated "#TODO: Fix for binds." comment [ci skip]Ryuta Kamizono2016-09-111-1/+0
|/ | | | This comment was added at eaf5486 but already implemented.
* Merge pull request #26380 from kamipo/pass_set_inverse_instance_blockKasper Timm Hansen2016-09-081-2/+2
|\ | | | | Pass `set_inverse_instance` block to `sc.execute` for `SingularAssociation`
| * Pass `set_inverse_instance` block to `sc.execute` for `SingularAssociation`Ryuta Kamizono2016-09-031-2/+2
| | | | | | | | | | | | | | Follow up to caa178c. caa178c updated all code which sets inverse instances on newly loaded associations to use block. But `SingularAssociation` was forgotten it.
* | Merge pull request #26431 from wytesk133/masterप्रथमेश Sonpatki2016-09-081-1/+1
|\ \ | | | | | | Fix table name typos [ci skip]
| * | Fix table name typos [ci skip]Waitaya Krongapiradee2016-09-081-1/+1
| | |
* | | Merge pull request #26426 from y-yagi/update_doc_about_default_cache_storeJon Moss2016-09-071-1/+1
|\ \ \ | | | | | | | | update doc about default `cache_store` [ci skip]
| * | | update doc about default `cache_store` [ci skip]yuuji.yaginuma2016-09-081-1/+1
| | | | | | | | | | | | | | | | The default `cache_store` has changed in 8f0e0b6 to use `file_store`.
* | | | Merge pull request #26418 from y-yagi/fixes_26415Richard Schneeman2016-09-072-1/+8
|\ \ \ \ | | | | | | | | | | call `.to_h` to avoid using deprecated method
| * | | | call `.to_h` to avoid using deprecated methodyuuji.yaginuma2016-09-072-1/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActionController::Parameters#merge` call `HashWithIndifferentAccess#merge`. In addition, it calls `HashWithIndifferentAccess#update` from `HashWithIndifferentAccess#merge`, where it is called the `#to_hash` of argument. But `ActionController::Parameters#to_hash` is deprecated, warning message is displayed. To avoid this, modify to convert object to `Hash`. Fixes #26415
* | | | Merge pull request #26016 from nateberkopec/patch-1Vipul A M2016-09-071-2/+3
|\ \ \ \ | |/ / / |/| | | Clarify expires_now documentation
| * | | Clarify expires_now documentationNate Berkopec2016-09-061-2/+3
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #26390 from Neodelf/format_mdsVipul A M2016-09-074-8/+8
|\ \ \ \ | | | | | | | | | | [ci skip] Simply formatting documents
| * | | | [ci skip] Simply formatting documentsNeodelf2016-09-064-8/+8
| | | | |
* | | | | Merge pull request #26412 from rails/revert-26410-rm-dupsGuillermo Iguaran2016-09-061-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Revert " [ci skip] Remove duplicate example."
| * | | | | Revert " [ci skip] Remove duplicate example."Vipul A M2016-09-061-0/+5
|/ / / / /
* | | | | Merge pull request #26410 from aditya-kapoor/rm-dupsVipul A M2016-09-061-5/+0
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Remove duplicate example.
| * | | | | [ci skip] Remove duplicate example.Aditya Kapoor2016-09-061-5/+0
| | | | | |
* | | | | | Merge pull request #24612 from vipulnsward/fix-li-ol-widthVijay Dev2016-09-061-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Selectively add `li ul, li ol { margin:0 1.5em; }` to subColl as needed
| * | | | | | Selectively add `li ul, li ol { margin:0 1.5em; }` to subColl needed for ↵Vipul A M2016-04-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chapters column, instead of leaking to other lists. Before: https://monosnap.com/file/CNIMXcqv3HuRrObTNYWYFis8I3G8PT After: https://monosnap.com/file/0IyEKEy9hcRCIx82etR8ikinCo3vNb Chapters column remains as is: http://take.ms/M0BkF
* | | | | | | Merge pull request #26408 from tricknotes/bye-mongrel-from-docsVipul A M2016-09-067-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove the word "mongrel" from documents [ci skip]
| * | | | | | | Remove the word "mongrel" from documentsRyunosuke Sato2016-09-077-9/+9
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently mongrel is not maintained. And it couldn't be built with any Ruby versions that supported by Rails. It is reasonable to remove the word "mongrel" in order to avoid confusion from newcomer.
* | | | | | | Merge pull request #26405 from alexcameron89/case_statement_formattingXavier Noria2016-09-0610-113/+123
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix Remaining Case-In-Assignment Statement Formatting
| * | | | | | | Fix Remaining Case-In-Assignment Statement FormattingAlex Kitchens2016-09-0610-113/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently, the Rails team made an effort to keep the source code consistent, using Ruboco (bb1ecdcc677bf6e68e0252505509c089619b5b90 and below). Some of the case statements were missed. This changes the case statements' formatting and is consistent with changes in 810dff7c9fa9b2a38eb1560ce0378d760529ee6b and db63406cb007ab3756d2a96d2e0b5d4e777f8231.
* | | | | | | | Merge pull request #26406 from SpartaSixZero/masterVipul A M2016-09-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Minor grammar fix in engines.md [ci skip]
| * | | | | | | Minor grammar fix in engines.mdMark Sun2016-09-061-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #26394 from kamipo/remove_redundant_conditionAndrew White2016-09-061-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove redundant `!loaded?` condition
| * | | | | | | Remove redundant `!loaded?` conditionRyuta Kamizono2016-09-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Already checked `if !find_target? || loaded?`, unnecessary `!loaded?` in elsif condition.
* | | | | | | | Merge pull request #26397 from yui-knk/unused_inner_aliasMatthew Draper2016-09-061-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Remove not used alias method
| * | | | | | | Remove not used alias methodyui-knk2016-09-061-1/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bang methods of `AR::QueryMethods` are used only internally. We only use `left_outer_joins!`, so we can remove this alias.
* | | | | | | Merge pull request #26370 from yahonda/rails26368Andrew White2016-09-052-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move `require "models/post"` before `require "models/comment"`
| * | | | | | | Change require order to come `require "models/post"` before `require ↵Yasuo Honda2016-09-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "models/comment"` to address BasicsTest#test_readonly_attributes failure #26368 It reproduces only when both of these conditions are satisfied: - Other test files `autosave_association_test.rb` or `where_test.rb` which executes `require "models/comment"` then `require "models/post"` - When `autosave_association_test.rb` or `where_test.rb` executed before `base_test.rb`
* | | | | | | | Merge pull request #26391 from y-yagi/use_descendants_to_get_all_subclassesAndrew White2016-09-054-1/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | use `descendants` to get class that inherited `ActiveJob::Base`
| * | | | | | | | use `descendants` to get class that inherited `ActiveJob::Base`yuuji.yaginuma2016-09-054-1/+17
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `subclasses` get only child classes. Therefore, if create a job common parent class as `ApplicationJob`, inherited class does not get properly.
* | | | | | | | Merge pull request #26379 from kamipo/remove_unnecessary_query_scopeAndrew White2016-09-051-4/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Remove unnecessary `query_scope`
| * | | | | | | Remove unnecessary `query_scope`Ryuta Kamizono2016-08-161-4/+0
| | | | | | | |
* | | | | | | | Merge pull request #26392 from y-yagi/chage_descendants_to_public_apiVipul A M2016-09-051-2/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | change `Class#descendants` to public API [ci skip]
| * | | | | | | | change `Class#descendants` to public API [ci skip]yuuji.yaginuma2016-09-051-2/+15
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Class#descendants` has already been displayed in Rails guide, so I think that may be displayed in doc. http://guides.rubyonrails.org/active_support_core_extensions.html#descendants
* | | | | | | | Merge pull request #26377 from y-yagi/rename_test_method_to_avoid_overridingEileen M. Uchitelle2016-09-041-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | rename test method to avoid overriding
| * | | | | | | | rename test method to avoid overridingyuuji.yaginuma2016-09-031-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warning. ``` ./test/dispatch/routing_test.rb:3696: warning: method redefined; discarding old test_namespaced_roots ./test/dispatch/routing_test.rb:1632: warning: previous definition of test_namespaced_roots was here ```
* | | | | | | | Merge pull request #26383 from ↵Eileen M. Uchitelle2016-09-042-36/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_unnecessary_count_for_collection_proxy Remove unnecessary `count` method for collection proxy
| * | | | | | | | Remove unnecessary `count` method for collection proxyRyuta Kamizono2016-09-042-36/+14
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Simply use its own method because `CollectionProxy` inherits `Relation`.
* | | | | | | | Merge pull request #26384 from ↵Eileen M. Uchitelle2016-09-043-1/+43
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | y-yagi/make_fixture_file_upload_in_integration_test make `fixture_file_upload` work in integration tests
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 06:19:51 +0000